commit:     3e6f0d7e573c9141d2f3b5bb284caef999663294
Author:     Marek BehĂșn <kabel <AT> kernel <DOT> org>
AuthorDate: Thu Aug 18 17:53:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 05:23:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f0d7e

Revert "toolchain.eclass: ensure thumb mode for armv6m"

This reverts commit 903b71810e0b270a7d494e16e2d799fcd95ae50f.

The commit caused default libgcc to be built in thumb mode for armv6m
target, but it broke subsequent compilation of newlib via crossdev.

The whole reason of this commit was to have the compiler generate
correct code when libgcc was used in thumb mode, but now this is not
needed anymore, because now we configure gcc with
--with-multilib-list=aprofile,rmprofile for CTARGET=arm-* when used with
multilib, which generates compiler that builds correct binaries for
-march=armv6-m even if libgcc is used.

Signed-off-by: Marek BehĂșn <kabel <AT> kernel.org>
Closes: https://github.com/gentoo/gentoo/pull/26914
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 29076efc3f54..5c6e39472a58 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1187,8 +1187,6 @@ toolchain_src_configure() {
                                fi
                        done
 
-                       # Convert armv6m to armv6-m
-                       [[ ${arm_arch} == armv6m ]] && arm_arch=armv6-m
                        # Convert armv7{a,r,m} to armv7-{a,r,m}
                        [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
                        # See if this is a valid --with-arch flag

Reply via email to