From 05a34d98821265bf73820931936f86704b9002c6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 23 Aug 2022 08:44:14 +0100 Subject: gentoo auto-resync : 23:08:2022 - 08:44:14 --- eclass/toolchain.eclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'eclass/toolchain.eclass') diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index ed473e0c626f..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 @@ -1213,6 +1211,17 @@ toolchain_src_configure() { armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;; esac fi + + # If multilib is used, make the compiler build multilibs + # for A or R and M architecture profiles. Do this only + # when no specific arch/mode/float is specified, e.g. + # for target arm-none-eabi, since doing this is + # incompatible with --with-arch/cpu/float/fpu. + if is_multilib && [[ ${arm_arch} == arm ]] && \ + tc_version_is_at_least 7.1 + then + confgcc+=( --with-multilib-list=aprofile,rmprofile ) + fi ;; mips) # Add --with-abi flags to set default ABI -- cgit v1.2.3