[PATCH 09/15] MIPS/GAS/test: Convert LD tests to multi-arch

["Maciej W. Rozycki" <macro at linux-mips dot org>]

Hi,

 This change converts the LD tests to multi-arch, o32.  The existing dump 
patterns are only suitable for MIPS I targets (no LDC1/SDC1 instructions) 
so they are only run for a limited subset of architectures (effectively 
"mips1", "r3000" and "r3900").  This will be fixed next.

2010-10-03  Maciej W. Rozycki  <macro@linux-mips.org>

	gas/testsuite/
	* gas/mips/ld.s: Remove ".set mips1".
	* gas/mips/ld.d: Remove "-march=r4000" and "-mmips:4000" from
	gas/objdump options.
	* gas/mips/ld-ilocks.d: Add "-32" to gas options.
	* gas/mips/mips.exp: Run the two cases with run_dump_test_arches.

 OK to apply?

  Maciej

binutils-2.20.51-20100925-mips-gas-test-ld-arch.patch
Index: binutils-2.20.51/gas/testsuite/gas/mips/ld.d
===================================================================
--- binutils-2.20.51.orig/gas/testsuite/gas/mips/ld.d
+++ binutils-2.20.51/gas/testsuite/gas/mips/ld.d
@@ -1,5 +1,5 @@
-#objdump: -dr --prefix-addresses -mmips:4000
-#as: -32 -march=r4000
+#objdump: -dr --prefix-addresses
+#as: -32
 #name: MIPS ld
 
 # Test the ld macro.
Index: binutils-2.20.51/gas/testsuite/gas/mips/mips.exp
===================================================================
--- binutils-2.20.51.orig/gas/testsuite/gas/mips/mips.exp
+++ binutils-2.20.51/gas/testsuite/gas/mips/mips.exp
@@ -402,7 +402,6 @@ if { [istarget mips*-*-vxworks*] } {
     set elf [expr [istarget *-*-elf*] || [istarget *-*-irix5*] || [istarget *-*-irix6* ] || [istarget *-*-linux*] || [istarget *-*-netbsd*] ]
     set ecoff [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ]
     set aout [expr [istarget *-*-bsd*] || [istarget *-*-openbsd*] ]
-    set gpr_ilocks [expr [istarget mipstx39*-*-*]]
     set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]]
     set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
 
@@ -494,11 +493,10 @@ if { [istarget mips*-*-vxworks*] } {
 	run_dump_test "lb-xgot-ilocks"
     }
     if !$aout {
-        if !$gpr_ilocks {
-            run_dump_test "ld"
-        } else { 
-	    run_dump_test "ld-ilocks"
-        }
+	run_dump_test_arches "ld" \
+				[mips_arch_list_matching mips1 !gpr_ilocks]
+	run_dump_test_arches "ld-ilocks" \
+				[mips_arch_list_matching gpr_ilocks !mips2]
     }
     if $elf { run_dump_test "ld-svr4pic" }
     if $elf { run_dump_test "ld-xgot" }
Index: binutils-2.20.51/gas/testsuite/gas/mips/ld.s
===================================================================
--- binutils-2.20.51.orig/gas/testsuite/gas/mips/ld.s
+++ binutils-2.20.51/gas/testsuite/gas/mips/ld.s
@@ -1,7 +1,5 @@
 # Source file used to test the ld macro.
 
-	.set	mips1
-
 	.bss
 	.align	12
 	.sbss
Index: binutils-2.20.51/gas/testsuite/gas/mips/ld-ilocks.d
===================================================================
--- binutils-2.20.51.orig/gas/testsuite/gas/mips/ld-ilocks.d
+++ binutils-2.20.51/gas/testsuite/gas/mips/ld-ilocks.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses
+#as: -32
 #name: MIPS ld-ilocks
 #source: ld.s
-#as:
 
 # Test the ld macro.