[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 --git a/gcc/testsuite/gcc.target/arm/multilib.exp b/gcc/testsuite/gcc.target/arm/multilib.exp
index 9b5e22e86d019143e18b1353160955a1068fa07f..05fb31316628136ccc6f69a2be24b5626706f290 100644 (file)
--- 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.