[PATCH] Fix some MIPS gas testcases for mips64-linux

[PATCH] Fix some MIPS gas testcases for mips64-linux

[Thiemo Seufer]

Hello All,

I committed the appended patch, it fixes some gas testsuite failures on
mips64-linux.


Thiemo


2006-07-04  Thiemo Seufer  <ths@mips.com>

	* gas/mips/e32-rel2.d, gas/mips/e32-rel4.d: Use -mabi=32 for as.
	* gas/mips/mips.exp: Move mips16e testcase to ELF only tests.
	Run elf{el}-rel2 and elf-rel4 for all arches with gpr64. Run
	e32-rel2 and e32-rel4 also for 64 bit configurations.


Index: gas/testsuite/gas/mips/e32-rel2.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/e32-rel2.d,v
retrieving revision 1.2
diff -u -p -r1.2 e32-rel2.d
--- gas/testsuite/gas/mips/e32-rel2.d	10 Aug 2001 20:38:33 -0000	1.2
+++ gas/testsuite/gas/mips/e32-rel2.d	4 Jul 2006 16:07:22 -0000
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc 2 (32-bit)
+#as: -mabi=32
 #source: elf-rel2.s
 
 # Test the GPREL and LITERAL generation.
Index: gas/testsuite/gas/mips/e32-rel4.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/e32-rel4.d,v
retrieving revision 1.2
diff -u -p -r1.2 e32-rel4.d
--- gas/testsuite/gas/mips/e32-rel4.d	5 Aug 2001 00:53:28 -0000	1.2
+++ gas/testsuite/gas/mips/e32-rel4.d	4 Jul 2006 16:07:22 -0000
@@ -1,5 +1,6 @@
 #objdump: --prefix-addresses -dr
-#name: MIPS ELF reloc 4
+#name: MIPS ELF reloc 4 (32-bit)
+#as: -mabi=32
 #source: elf-rel4.s
 
 .*: +file format.*
Index: gas/testsuite/gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.122
diff -u -p -r1.122 mips.exp
--- gas/testsuite/gas/mips/mips.exp	20 Jun 2006 17:09:29 -0000	1.122
+++ gas/testsuite/gas/mips/mips.exp	4 Jul 2006 16:07:22 -0000
@@ -533,6 +533,8 @@ if { [istarget mips*-*-vxworks*] } {
     if { $elf && !$no_mips16 } {
 	run_dump_test "mips16"
 	run_dump_test "mips16-64"
+	# Check MIPS16e extensions
+	run_dump_test_arches "mips16e" 	[mips_arch_list_matching mips32]
 	# Check jalx handling
 	run_dump_test "mips16-jalx"
 	run_dump_test "mips-jalx"
@@ -637,18 +639,11 @@ if { [istarget mips*-*-vxworks*] } {
   	run_dump_test "mips-abi32-pic2"
 
 	run_dump_test "elf${el}-rel"
-	if {[istarget mips64*-*-*] || [istarget mipsisa32*-*-*]
-	    || [istarget mipsisa64*-*-*]} { 
-	    run_dump_test "elf${el}-rel2"
-	} else {
-	    run_dump_test "e32${el}-rel2"
-	}
+	run_dump_test_arches "elf${el}-rel2" [mips_arch_list_matching gpr64]
+	run_dump_test "e32${el}-rel2"
 	run_dump_test "elf${el}-rel3"
-	if {[istarget mips64*-*-*]} {
-	    run_dump_test "elf-rel4"
-	} else {
-	    run_dump_test "e32-rel4"
-	}
+	run_dump_test_arches "elf-rel4" [mips_arch_list_matching gpr64]
+	run_dump_test "e32-rel4"
 	run_dump_test "elf-rel5"
 	run_dump_test "elf-rel6"
 	if $has_newabi {
@@ -786,8 +781,6 @@ if { [istarget mips*-*-vxworks*] } {
 	}
     }
     if { !$no_mips16 } { 
-        # Check MIPS16e extensions
-        run_dump_test_arches "mips16e" 	[mips_arch_list_matching mips32]
         run_dump_test "mips16e-jrc"
         run_dump_test "mips16e-save"
         run_dump_test "mips16e-64"