[gcc r15-6980] [testsuite] [arm] multilibs.exp: adjust float abi opt matching

[Alexandre Oliva via Gcc-cvs]

https://gcc.gnu.org/g:bc6e3a03b9ac6ad901ff67fd2a561e36c83d6a48

commit r15-6980-gbc6e3a03b9ac6ad901ff67fd2a561e36c83d6a48
Author: Alexandre Oliva <ol...@adacore.com>
Date:   Thu Jan 16 20:19:41 2025 -0300

    [testsuite] [arm] multilibs.exp: adjust float abi opt matching
    
    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.
    
    
    for  gcc/testsuite/ChangeLog
    
            * gcc.target/arm/multilib.exp: Skip if -mfloat-abi=* or any of
            its aliases are used.

Diff:
---
 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 9b5e22e86d01..05fb31316628 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.