From: Will Newton <will.newton@linaro.org>
Date: Tue, 8 Jul 2014 09:23:27 +0000 (+0100)
Subject: gas/ARM: Fix testsuite failure for arm-elf
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b42baa397bcacec234090eaac043d3d261b2908;p=binutils-gdb.git

gas/ARM: Fix testsuite failure for arm-elf

At some point the arm-elf output became the same as arm-eabi. Remove
the special handling of arm-elf.

gas/testsuite/ChangeLog:

2014-07-10  Will Newton  <will.newton@linaro.org>

	* gas/elf/elf.exp: Remove special handling of arm-elf for
	section2 test.
	* gas/elf/section2.e-armeabi: Rename to...
	* gas/elf/section2.e-arm: ...here.
	* gas/elf/section2.e-armelf: Remove file.
---

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ef34f265829..a7a69465c2b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2014-07-10  Will Newton  <will.newton@linaro.org>
 
+	* gas/elf/elf.exp: Remove special handling of arm-elf for
+	section2 test.
+	* gas/elf/section2.e-armeabi: Rename to...
+	* gas/elf/section2.e-arm: ...here.
+	* gas/elf/section2.e-armelf: Remove file.
+
 	* gas/arm/bl-local-2.d: Only enable the test on EABI and
 	NaCl configurations.
 	* gas/arm/bl-local-v4t.d: Likewise.
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index a967d2f73c0..f17f7e00b3e 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -77,15 +77,7 @@ if { [is_elf_format] } then {
 	set target_machine -rx
     }
     if {[istarget "arm*-*-*"]} {
-
-	if { ([istarget "*-*-*eabi"]
-	      || [istarget "*-*-linux-*"]
-	      || [istarget "*-*-nacl*"]
-	      || [istarget "*-*-symbianelf"])} then {
-	    set target_machine -armeabi
-	} else {
-	    set target_machine -armelf
-	}
+	set target_machine -arm
     }
 
     # The MN10300 and Xtensa ports disable the assembler's call frame
diff --git a/gas/testsuite/gas/elf/section2.e-arm b/gas/testsuite/gas/elf/section2.e-arm
new file mode 100644
index 00000000000..115bae2173d
--- /dev/null
+++ b/gas/testsuite/gas/elf/section2.e-arm
@@ -0,0 +1,9 @@
+
+Symbol table '.symtab' contains 6 entries:
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 
+ +5: 0+0 +0 +SECTION +LOCAL +DEFAULT +5 
diff --git a/gas/testsuite/gas/elf/section2.e-armeabi b/gas/testsuite/gas/elf/section2.e-armeabi
deleted file mode 100644
index 115bae2173d..00000000000
--- a/gas/testsuite/gas/elf/section2.e-armeabi
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Symbol table '.symtab' contains 6 entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 
- +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 
- +5: 0+0 +0 +SECTION +LOCAL +DEFAULT +5 
diff --git a/gas/testsuite/gas/elf/section2.e-armelf b/gas/testsuite/gas/elf/section2.e-armelf
deleted file mode 100644
index de16912ba3b..00000000000
--- a/gas/testsuite/gas/elf/section2.e-armelf
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Symbol table '.symtab' contains 7 entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 
- +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 
- +5: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +4 \$d
- +6: 0+0 +0 +SECTION +LOCAL +DEFAULT +5