PR gas/4804

* gas/elf/elf.exp (target_machine): Treat the arm-linux-gnu target in the same way as the arm-eabi target.
* gas/arm/mapshort-eabi.d: Use this file for the arm-linux-gnu target.
* gas/arm/mapshort-elf.d: Do not use this file for the arm-linux-gnu target.

gas/testsuite/ChangeLog

@@ -1,3 +1,13 @@
+2007-07-19  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/4804
+	* gas/elf/elf.exp (target_machine): Treat the arm-linux-gnu target
+	in the same way as the arm-eabi target.
+	* gas/arm/mapshort-eabi.d: Use this file for the arm-linux-gnu
+	target.
+	* gas/arm/mapshort-elf.d: Do not use this file for the
+	arm-linux-gnu target.
+
 2007-07-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/i386/simd.s: Add tests for punpcklbw, punpckldq,

gas/testsuite/gas/arm/mapshort-eabi.d

@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .short (EABI version)
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf
+#target: *-*-*eabi *-*-symbianelf *-*-linux-*
 #source: mapshort.s
 
 # Test the generation and use of ARM ELF Mapping Symbols

gas/testsuite/gas/arm/mapshort-elf.d

@@ -1,7 +1,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .short (ELF version)
 # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf *-*-linux-*
 #source: mapshort.s
 
 # Test the generation and use of ARM ELF Mapping Symbols

gas/testsuite/gas/elf/elf.exp

@@ -60,6 +60,7 @@ if { ([istarget "*-*-*elf*"]
 	  || [istarget "xscale*-*-*"]) } {
 	
 	if { ([istarget "*-*-*eabi"]
+	      || [istarget "*-*-linux-*"]
 	      || [istarget "*-*-symbianelf"])} then {
 	    set target_machine -armeabi
 	} else {