arm: fix testsuite fallout on arm-elf and arm-nto from FPA removal

Removing FPA means that in some cases we default to 'no-fpu' in the
assembler when previously we would have picked FPA-format floating
numbers.  This patch fixes the testsuite fallout on a couple of
targets that are affected by this change.  Where possible we do this
by adding an option to set the floating-point format, but for bad-bss
we just skip the test.

diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index af461b1988d5e415a5860e0cb192f1a72ff67603..3a92263630215da34860fef0dc94f5cc9a1df29f 100644 (file)
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -47,7 +47,9 @@ if { ![istarget cris-*-*] && ![istarget crisv32-*-*]
      && ![istarget z80-*-*] } then {
     if { [istarget tic4x-*-*] } then {
        set as_opt ""
-    } elseif { [istarget arm*-*-pe ] } then {
+    } elseif { [istarget arm*-*-pe ]
+              || [istarget arm*-*-elf]
+              || [istarget arm*-*-nto*] } then {
        set as_opt "--defsym hasnan=1 -mfpu=softvfp"
     } else {
        set as_opt "--defsym hasnan=1"

diff --git a/gas/testsuite/gas/arm/float16-eabi-alternative-format.d b/gas/testsuite/gas/arm/float16-eabi-alternative-format.d
index 0729a5ccc215dfd38955b0e7d78d17c78155c0f7..54636a481ed6d332ce26e39c5927b762bbaa2020 100644 (file)
--- a/gas/testsuite/gas/arm/float16-eabi-alternative-format.d
+++ b/gas/testsuite/gas/arm/float16-eabi-alternative-format.d
@@ -2,7 +2,7 @@
 # readelf: -A
 # notarget: *-*pe *-*-wince
 # source: float16-eabi.s
-# as: -mfp16-format=alternative
+# as: -mfp16-format=alternative -mfpu=softvfp
 Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes

diff --git a/gas/testsuite/gas/arm/float16-eabi-ieee-format.d b/gas/testsuite/gas/arm/float16-eabi-ieee-format.d
index d02ed73fb00a76b4e0b2adf87e409bad5de7157f..7d8412b0a525f54695704f10ab8cefdbf9cf2a8c 100644 (file)
--- a/gas/testsuite/gas/arm/float16-eabi-ieee-format.d
+++ b/gas/testsuite/gas/arm/float16-eabi-ieee-format.d
@@ -2,7 +2,7 @@
 # readelf: -A
 # notarget: *-*pe *-*wince
 # source: float16-eabi.s
-# as: -mfp16-format=ieee
+# as: -mfp16-format=ieee -mfpu=softvfp
 Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes

diff --git a/gas/testsuite/gas/arm/float16-eabi-no-format.d b/gas/testsuite/gas/arm/float16-eabi-no-format.d
index 0d54f844218dfae227ace986aa11a92cc89e7161..706a7475e13ace3b90388f4479c601990393478f 100644 (file)
--- a/gas/testsuite/gas/arm/float16-eabi-no-format.d
+++ b/gas/testsuite/gas/arm/float16-eabi-no-format.d
@@ -2,6 +2,7 @@
 # readelf: -A
 # notarget: *-*pe *-*-wince
 # source: float16-eabi.s
+# as: -mfpu=softvfp
 Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes

diff --git a/gas/testsuite/gas/elf/bad-bss.d b/gas/testsuite/gas/elf/bad-bss.d
index 24a2c620d73e794882c7b6db8cfe6f15bc8c5da1..427faf5f03e8a656e094ee6aa49f388c07d7e2a1 100644 (file)
--- a/gas/testsuite/gas/elf/bad-bss.d
+++ b/gas/testsuite/gas/elf/bad-bss.d
@@ -1,4 +1,5 @@
 #name: bad .bss / .struct data allocation directives
 #source: bss.s
 #error_output: bad-bss.err
+#notarget: arm*-*-elf arm*-*-nto*
 #target: i?86-*-* x86_64-*-* ia64-*-* arm-*-* aarch64-*-* kvx-*-*