* gas/mips/mips.exp: Invoke the tests smartmips, mips32-dsp,

	mips32-dspr2, mips64-dsp and mips32-mt with run_dump_test instead
	of run_dump_test_arches.
	* gas/mips/smartmips.d: Pass -mips32.
	* gas/mips/mips64-dsp.d: Pass -mips64r2.
	* gas/mips/mips32-dsp.d: Pass -mips32r2.
	* gas/mips/mips32-dspr2.d: Likewise.
	* gas/mips/mips32-mt.d: Likewise.

7 files changed, 21 insertions, 10 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 11f894b..2e44122 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-05  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* gas/mips/mips.exp: Invoke the tests smartmips, mips32-dsp,
+	mips32-dspr2, mips64-dsp and mips32-mt with run_dump_test instead
+	of run_dump_test_arches.
+	* gas/mips/smartmips.d: Pass -mips32.
+	* gas/mips/mips64-dsp.d: Pass -mips64r2.
+	* gas/mips/mips32-dsp.d: Pass -mips32r2.
+	* gas/mips/mips32-dspr2.d: Likewise.
+	* gas/mips/mips32-mt.d: Likewise.
+
 2008-02-04  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* gas/mips/mips.exp: Call mips_arch_create for Octeon.  Invoke
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 435ceae..4def589 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -766,11 +766,11 @@ if { [istarget mips*-*-vxworks*] } {
 
     run_dump_test "octeon"
 
-    run_dump_test_arches "smartmips"	[mips_arch_list_matching mips32 !gpr64]
-    run_dump_test_arches "mips32-dsp"	[mips_arch_list_matching mips32r2]
-    run_dump_test_arches "mips32-dspr2"	[mips_arch_list_matching mips32r2]
-    run_dump_test_arches "mips64-dsp"	[mips_arch_list_matching mips64r2]
-    run_dump_test_arches "mips32-mt"	[mips_arch_list_matching mips32r2 !gpr64]
+    run_dump_test "smartmips"
+    run_dump_test "mips32-dsp"
+    run_dump_test "mips32-dspr2"
+    run_dump_test "mips64-dsp"
+    run_dump_test "mips32-mt"
 
     if { $elf && !$no_mips16 } {
 	run_dump_test "mips16-dwarf2"
diff --git a/gas/testsuite/gas/mips/mips32-dsp.d b/gas/testsuite/gas/mips/mips32-dsp.d
index d538abd..b0898e4 100644
--- a/gas/testsuite/gas/mips/mips32-dsp.d
+++ b/gas/testsuite/gas/mips/mips32-dsp.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS DSP ASE for MIPS32
-#as: -mdsp -32
+#as: -mdsp -mips32r2 -32
 
 # Check MIPS DSP ASE for MIPS32 Instruction Assembly
 
diff --git a/gas/testsuite/gas/mips/mips32-dspr2.d b/gas/testsuite/gas/mips/mips32-dspr2.d
index 90c20ef..26f3a00 100644
--- a/gas/testsuite/gas/mips/mips32-dspr2.d
+++ b/gas/testsuite/gas/mips/mips32-dspr2.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS DSP ASE Rev2 for MIPS32
-#as: -mdspr2 -32
+#as: -mdspr2 -mips32r2 -32
 
 # Check MIPS DSP ASE Rev2 for MIPS32 Instruction Assembly
 
diff --git a/gas/testsuite/gas/mips/mips32-mt.d b/gas/testsuite/gas/mips/mips32-mt.d
index c640732..e1c4cf3 100644
--- a/gas/testsuite/gas/mips/mips32-mt.d
+++ b/gas/testsuite/gas/mips/mips32-mt.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M cp0-names=mips32
 #name: MIPS MT ASE for MIPS32
-#as: -mmt -32
+#as: -mmt -mips32r2 -32
 #stderr: mips32-mt.l
 
 # Check MIPS MT ASE for MIPS32 Instruction Assembly
diff --git a/gas/testsuite/gas/mips/mips64-dsp.d b/gas/testsuite/gas/mips/mips64-dsp.d
index 11009a0..b56855d 100644
--- a/gas/testsuite/gas/mips/mips64-dsp.d
+++ b/gas/testsuite/gas/mips/mips64-dsp.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=32
 #name: MIPS DSP ASE for MIPS64
-#as: -mdsp
+#as: -mdsp -mips64r2
 
 # Check MIPS DSP ASE for MIPS64 Instruction Assembly
 
diff --git a/gas/testsuite/gas/mips/smartmips.d b/gas/testsuite/gas/mips/smartmips.d
index 8bff682..a028276 100644
--- a/gas/testsuite/gas/mips/smartmips.d
+++ b/gas/testsuite/gas/mips/smartmips.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: SmartMIPS
-#as: -msmartmips -32
+#as: -msmartmips -mips32 -32
 
 
 .*: +file format .*mips.*