[4/4] gas/ARM: Fix testsuite failure for arm-elf

Message ID 1404828845-20737-4-git-send-email-will.newton@linaro.org
State Accepted
Headers show

Commit Message

Will Newton July 8, 2014, 2:14 p.m.
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-08  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/testsuite/gas/elf/elf.exp            | 10 +---------
 gas/testsuite/gas/elf/section2.e-arm     |  9 +++++++++
 gas/testsuite/gas/elf/section2.e-armeabi |  9 ---------
 gas/testsuite/gas/elf/section2.e-armelf  | 10 ----------
 4 files changed, 10 insertions(+), 28 deletions(-)
 create mode 100644 gas/testsuite/gas/elf/section2.e-arm
 delete mode 100644 gas/testsuite/gas/elf/section2.e-armeabi
 delete mode 100644 gas/testsuite/gas/elf/section2.e-armelf

Comments

Nick Clifton July 9, 2014, 8:24 a.m. | #1
Hi Will,

> gas/testsuite/ChangeLog:
>
> 2014-07-08  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.

Approved - please apply.

Cheers
   Nick

Patch

diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index a967d2f..f17f7e0 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 0000000..115bae2
--- /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 115bae2..0000000
--- 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 de16912..0000000
--- 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