From 01469ac03e0673d40f8372d5e89139f86327e658 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Thu, 6 Jun 2024 15:55:16 +0100
Subject: 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.
---
 gas/testsuite/gas/all/gas.exp                           | 4 +++-
 gas/testsuite/gas/arm/float16-eabi-alternative-format.d | 2 +-
 gas/testsuite/gas/arm/float16-eabi-ieee-format.d        | 2 +-
 gas/testsuite/gas/arm/float16-eabi-no-format.d          | 1 +
 gas/testsuite/gas/elf/bad-bss.d                         | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index af461b1..3a92263 100644
--- 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 0729a5c..54636a4 100644
--- 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 d02ed73..7d8412b 100644
--- 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 0d54f84..706a747 100644
--- 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 24a2c62..427faf5 100644
--- 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-*-*
-- 
cgit v1.1