The regexp that matches options that mess with multilibs matches
-mfloat=abi=, but that's probably a typo for -mfloat-abi=. Fix that,
and add -msoft-float and -mhard-float.
Regstrapped on x86_64-linux-gnu, also tested on arm-eabi and
aarch64-elf. Ok to install?
for gcc/testsuite/ChangeLog
* gcc.target/arm/multilib.exp: Skip if -mfloat-abi=* or any of
its aliases are used.
---
gcc/testsuite/gcc.target/arm/multilib.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp
b/gcc/testsuite/gcc.target/arm/multilib.exp
index 9b5e22e86d019..05fb313166281 100644
--- a/gcc/testsuite/gcc.target/arm/multilib.exp
+++ b/gcc/testsuite/gcc.target/arm/multilib.exp
@@ -20,7 +20,7 @@ dg-init
foreach flagsvar {multilib_flags cflags} {
if { [board_info [target_info name] exists $flagsvar]
- && [regexp {(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat=abi=.*)\y}
[board_info [target_info name] $flagsvar]] } {
+ && [regexp
{(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat-abi=.*|-msoft-float|-mhard-float)\y}
[board_info [target_info name] $flagsvar]] } {
# Multilib flags override anything we can apply to a test, so
# skip if any of the above options are set there.
--
Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/
Free Software Activist GNU Toolchain Engineer
More tolerance and less prejudice are key for inclusion and diversity
Excluding neuro-others for not behaving ""normal"" is *not* inclusive
