Merge from mainline:

	2003-05-06  Alexandre Oliva  <aoliva@redhat.com>
	* gas/mips/abs.d, gas/mips/add.d, gas/mips/and.d,
	gas/mips/beq.d, gas/mips/bge.d, gas/mips/bgeu.d,
	gas/mips/blt.d, gas/mips/bltu.d, gas/mips/branch-misc-1.d,
	gas/mips/break20.d, gas/mips/cp0sel-names-mips32.d,
	gas/mips/cp0sel-names-mips32r2.d,
	gas/mips/cp0sel-names-mips64.d,
	gas/mips/cp0sel-names-numeric.d, gas/mips/cp0sel-names-sb1.d,
	gas/mips/elf-jal.d, gas/mips/elf-rel.d, gas/mips/elf-rel2.d,
	gas/mips/elf-rel3.d, gas/mips/elf-rel4.d, gas/mips/elf-rel5.d,
	gas/mips/elf-rel6.d, gas/mips/elf-rel7.d,
	gas/mips/elf_arch_mips1.d, gas/mips/elf_arch_mips2.d,
	gas/mips/elf_arch_mips3.d, gas/mips/elf_arch_mips32.d,
	gas/mips/elf_arch_mips32r2.d, gas/mips/elf_arch_mips4.d,
	gas/mips/elf_arch_mips5.d, gas/mips/elf_arch_mips64.d,
	gas/mips/elf_ase_mips16.d, gas/mips/empic.d,
	gas/mips/empic2.d, gas/mips/empic3_e.d, gas/mips/empic3_g1.d,
	gas/mips/empic3_g2.d, gas/mips/hwr-names-mips32r2.d,
	gas/mips/hwr-names-numeric.d, gas/mips/jal-empic-elf-2.d,
	gas/mips/jal-empic-elf-3.d, gas/mips/jal-empic-elf.d,
	gas/mips/jal-svr4pic.d, gas/mips/jal-xgot.d, gas/mips/jal.d,
	gas/mips/la-empic.d, gas/mips/la-svr4pic.d,
	gas/mips/la-xgot.d, gas/mips/la.d, gas/mips/lb-empic.d,
	gas/mips/lb-svr4pic.d, gas/mips/lb-xgot-ilocks.d,
	gas/mips/lb-xgot.d, gas/mips/lb.d, gas/mips/ld-empic.d,
	gas/mips/ld-svr4pic.d, gas/mips/ld-xgot.d, gas/mips/ld.d,
	gas/mips/li.d, gas/mips/lif-empic.d, gas/mips/lif-svr4pic.d,
	gas/mips/lif-xgot.d, gas/mips/lifloat.d,
	gas/mips/mips-gp32-fp32-pic.d, gas/mips/mips-gp32-fp32.d,
	gas/mips/mips-gp32-fp64-pic.d, gas/mips/mips-gp32-fp64.d,
	gas/mips/mips-gp64-fp32-pic.d, gas/mips/mips-gp64-fp32.d,
	gas/mips/mips-gp64-fp64-pic.d, gas/mips/mips-gp64-fp64.d,
	gas/mips/mips.exp, gas/mips/mips16-e.d, gas/mips/mips16-f.d,
	gas/mips/mips32.d, gas/mips/mips32r2.d, gas/mips/mips4010.d,
	gas/mips/mips4650.d, gas/mips/mips64.d, gas/mips/mipsel16-e.d,
	gas/mips/mipsel16-f.d, gas/mips/rol-hw.d, gas/mips/rol.d,
	gas/mips/sb.d, gas/mips/sync.d, gas/mips/tempic.d,
	gas/mips/tmips16-e.d, gas/mips/tmips16-f.d,
	gas/mips/tmipsel16-e.d, gas/mips/tmipsel16-f.d,
	gas/mips/trunc.d, gas/mips/uld.d, gas/mips/ulh-empic.d,
	gas/mips/ulh-svr4pic.d, gas/mips/ulh-xgot.d, gas/mips/ulh.d,
	gas/mips/ulh2-eb.d, gas/mips/ulh2-el.d, gas/mips/ulw.d,
	gas/mips/ulw2-eb.d, gas/mips/ulw2-eb-ilocks.d, gas/mips/ulw2-el.d,
	gas/mips/ulw2-el-ilocks.d, gas/mips/usd.d, gas/mips/ush.d,
	gas/mips/usw.d, gas/mips/vr4122.d: Added ABI specification.
	gas/vtable/vtable.exp: mips64*-*-linux* and mips*-*-irix6* are
	RELA.

109 files changed, 167 insertions, 88 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c7bce9a..029bfb3 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,55 @@
+2003-05-15  Daniel Jacobowitz  <drow@mvista.com>
+
+	Merge from mainline:
+
+	2003-05-06  Alexandre Oliva  <aoliva@redhat.com>
+	* gas/mips/abs.d, gas/mips/add.d, gas/mips/and.d,
+	gas/mips/beq.d, gas/mips/bge.d, gas/mips/bgeu.d,
+	gas/mips/blt.d, gas/mips/bltu.d, gas/mips/branch-misc-1.d,
+	gas/mips/break20.d, gas/mips/cp0sel-names-mips32.d,
+	gas/mips/cp0sel-names-mips32r2.d,
+	gas/mips/cp0sel-names-mips64.d,
+	gas/mips/cp0sel-names-numeric.d, gas/mips/cp0sel-names-sb1.d,
+	gas/mips/elf-jal.d, gas/mips/elf-rel.d, gas/mips/elf-rel2.d,
+	gas/mips/elf-rel3.d, gas/mips/elf-rel4.d, gas/mips/elf-rel5.d,
+	gas/mips/elf-rel6.d, gas/mips/elf-rel7.d,
+	gas/mips/elf_arch_mips1.d, gas/mips/elf_arch_mips2.d,
+	gas/mips/elf_arch_mips3.d, gas/mips/elf_arch_mips32.d,
+	gas/mips/elf_arch_mips32r2.d, gas/mips/elf_arch_mips4.d,
+	gas/mips/elf_arch_mips5.d, gas/mips/elf_arch_mips64.d,
+	gas/mips/elf_ase_mips16.d, gas/mips/empic.d,
+	gas/mips/empic2.d, gas/mips/empic3_e.d, gas/mips/empic3_g1.d,
+	gas/mips/empic3_g2.d, gas/mips/hwr-names-mips32r2.d,
+	gas/mips/hwr-names-numeric.d, gas/mips/jal-empic-elf-2.d,
+	gas/mips/jal-empic-elf-3.d, gas/mips/jal-empic-elf.d,
+	gas/mips/jal-svr4pic.d, gas/mips/jal-xgot.d, gas/mips/jal.d,
+	gas/mips/la-empic.d, gas/mips/la-svr4pic.d,
+	gas/mips/la-xgot.d, gas/mips/la.d, gas/mips/lb-empic.d,
+	gas/mips/lb-svr4pic.d, gas/mips/lb-xgot-ilocks.d,
+	gas/mips/lb-xgot.d, gas/mips/lb.d, gas/mips/ld-empic.d,
+	gas/mips/ld-svr4pic.d, gas/mips/ld-xgot.d, gas/mips/ld.d,
+	gas/mips/li.d, gas/mips/lif-empic.d, gas/mips/lif-svr4pic.d,
+	gas/mips/lif-xgot.d, gas/mips/lifloat.d,
+	gas/mips/mips-gp32-fp32-pic.d, gas/mips/mips-gp32-fp32.d,
+	gas/mips/mips-gp32-fp64-pic.d, gas/mips/mips-gp32-fp64.d,
+	gas/mips/mips-gp64-fp32-pic.d, gas/mips/mips-gp64-fp32.d,
+	gas/mips/mips-gp64-fp64-pic.d, gas/mips/mips-gp64-fp64.d,
+	gas/mips/mips.exp, gas/mips/mips16-e.d, gas/mips/mips16-f.d,
+	gas/mips/mips32.d, gas/mips/mips32r2.d, gas/mips/mips4010.d,
+	gas/mips/mips4650.d, gas/mips/mips64.d, gas/mips/mipsel16-e.d,
+	gas/mips/mipsel16-f.d, gas/mips/rol-hw.d, gas/mips/rol.d,
+	gas/mips/sb.d, gas/mips/sync.d, gas/mips/tempic.d,
+	gas/mips/tmips16-e.d, gas/mips/tmips16-f.d,
+	gas/mips/tmipsel16-e.d, gas/mips/tmipsel16-f.d,
+	gas/mips/trunc.d, gas/mips/uld.d, gas/mips/ulh-empic.d,
+	gas/mips/ulh-svr4pic.d, gas/mips/ulh-xgot.d, gas/mips/ulh.d,
+	gas/mips/ulh2-eb.d, gas/mips/ulh2-el.d, gas/mips/ulw.d,
+	gas/mips/ulw2-eb.d, gas/mips/ulw2-eb-ilocks.d, gas/mips/ulw2-el.d,
+	gas/mips/ulw2-el-ilocks.d, gas/mips/usd.d, gas/mips/ush.d,
+	gas/mips/usw.d, gas/mips/vr4122.d: Added ABI specification.
+	gas/vtable/vtable.exp: mips64*-*-linux* and mips*-*-irix6* are
+	RELA.
+
 2003-05-13  Hans-Peter Nilsson  <hp@axis.com>
 
 	* gas/macros/app1.s, gas/macros/app1.d, gas/macros/app2.s,
diff --git a/gas/testsuite/gas/mips/abs.d b/gas/testsuite/gas/mips/abs.d
index 397926e..fec31cf 100644
--- a/gas/testsuite/gas/mips/abs.d
+++ b/gas/testsuite/gas/mips/abs.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS abs
+#as: -32
 
 # Test the abs macro.
 
diff --git a/gas/testsuite/gas/mips/add.d b/gas/testsuite/gas/mips/add.d
index 02ecaee..1eb538b 100644
--- a/gas/testsuite/gas/mips/add.d
+++ b/gas/testsuite/gas/mips/add.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS add
+#as: -32
 
 # Test the add macro.
 
diff --git a/gas/testsuite/gas/mips/and.d b/gas/testsuite/gas/mips/and.d
index 452921e..414ea2f 100644
--- a/gas/testsuite/gas/mips/and.d
+++ b/gas/testsuite/gas/mips/and.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS and
+#as: -32
 
 # Test the and macro.
 
diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
index b02e1f5..824f4bf 100644
--- a/gas/testsuite/gas/mips/beq.d
+++ b/gas/testsuite/gas/mips/beq.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS beq
+#as: -32
 
 # Test the beq macro.
 
diff --git a/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
index 7924c02..189ae3f 100644
--- a/gas/testsuite/gas/mips/bge.d
+++ b/gas/testsuite/gas/mips/bge.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bge
+#as: -32
 
 # Test the bge macro.
 
diff --git a/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
index d927956..b367e0e 100644
--- a/gas/testsuite/gas/mips/bgeu.d
+++ b/gas/testsuite/gas/mips/bgeu.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bgeu
+#as: -32
 
 # Test the bgeu macro.
 
diff --git a/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
index ca6d8b5..fc6aa19 100644
--- a/gas/testsuite/gas/mips/blt.d
+++ b/gas/testsuite/gas/mips/blt.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS blt
+#as: -32
 
 # Test the blt macro.
 
diff --git a/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
index 5b14731..945d2a4 100644
--- a/gas/testsuite/gas/mips/bltu.d
+++ b/gas/testsuite/gas/mips/bltu.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS bltu
+#as: -32
 
 # Test the bltu macro.
 
diff --git a/gas/testsuite/gas/mips/branch-misc-1.d b/gas/testsuite/gas/mips/branch-misc-1.d
index 77c003d..1c5f26b 100644
--- a/gas/testsuite/gas/mips/branch-misc-1.d
+++ b/gas/testsuite/gas/mips/branch-misc-1.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS branch-misc-1
+#as: -32
 
 # Test the branches to local symbols in current file.
 
diff --git a/gas/testsuite/gas/mips/break20.d b/gas/testsuite/gas/mips/break20.d
index 3131898..b13fd17 100644
--- a/gas/testsuite/gas/mips/break20.d
+++ b/gas/testsuite/gas/mips/break20.d
@@ -1,4 +1,4 @@
-#as: -march=r3900
+#as: -32 -march=r3900
 #objdump: -dr --prefix-addresses -mmips:3900
 #name: MIPS 20-bit break
 
diff --git a/gas/testsuite/gas/mips/cp0sel-names-mips32.d b/gas/testsuite/gas/mips/cp0sel-names-mips32.d
index 8cefcb6..d8bcbbc 100644
--- a/gas/testsuite/gas/mips/cp0sel-names-mips32.d
+++ b/gas/testsuite/gas/mips/cp0sel-names-mips32.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32
 #name: MIPS CP0 with sel register disassembly (mips32)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
diff --git a/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d b/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
index f61ee8a..6f3660d 100644
--- a/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
+++ b/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips32r2
 #name: MIPS CP0 with sel register disassembly (mips32r2)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
diff --git a/gas/testsuite/gas/mips/cp0sel-names-mips64.d b/gas/testsuite/gas/mips/cp0sel-names-mips64.d
index 6073344..ae0cce2 100644
--- a/gas/testsuite/gas/mips/cp0sel-names-mips64.d
+++ b/gas/testsuite/gas/mips/cp0sel-names-mips64.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=mips64
 #name: MIPS CP0 with sel register disassembly (mips64)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
diff --git a/gas/testsuite/gas/mips/cp0sel-names-numeric.d b/gas/testsuite/gas/mips/cp0sel-names-numeric.d
index 0886cff..2ec1094 100644
--- a/gas/testsuite/gas/mips/cp0sel-names-numeric.d
+++ b/gas/testsuite/gas/mips/cp0sel-names-numeric.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=numeric
 #name: MIPS CP0 with sel register disassembly (numeric)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
diff --git a/gas/testsuite/gas/mips/cp0sel-names-sb1.d b/gas/testsuite/gas/mips/cp0sel-names-sb1.d
index 6263eed..ab54264 100644
--- a/gas/testsuite/gas/mips/cp0sel-names-sb1.d
+++ b/gas/testsuite/gas/mips/cp0sel-names-sb1.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32 -M gpr-names=numeric,cp0-names=sb1
 #name: MIPS CP0 with sel register disassembly (sb1)
-#as: -march=mips32
+#as: -32 -march=mips32
 #source: cp0sel-names.s
 
 # Check objdump's handling of -M cp0-names=foo options.
diff --git a/gas/testsuite/gas/mips/elf-jal.d b/gas/testsuite/gas/mips/elf-jal.d
index 97f3247..40cd28b 100644
--- a/gas/testsuite/gas/mips/elf-jal.d
+++ b/gas/testsuite/gas/mips/elf-jal.d
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF jal
 #source: jal.s
+#as: -32
 
 # Test the jal macro.
 
diff --git a/gas/testsuite/gas/mips/elf-rel.d b/gas/testsuite/gas/mips/elf-rel.d
index d0248c6..ebc30a0 100644
--- a/gas/testsuite/gas/mips/elf-rel.d
+++ b/gas/testsuite/gas/mips/elf-rel.d
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc
+#as: -32
 
 # Test the HI16/LO16 generation.
 
diff --git a/gas/testsuite/gas/mips/elf-rel2.d b/gas/testsuite/gas/mips/elf-rel2.d
index 5524d1e..0cb1d41 100644
--- a/gas/testsuite/gas/mips/elf-rel2.d
+++ b/gas/testsuite/gas/mips/elf-rel2.d
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc 2
+#as: -mabi=o64
 
 # Test the GPREL and LITERAL generation.
 # FIXME: really this should check that the contents of .sdata, .lit4,
diff --git a/gas/testsuite/gas/mips/elf-rel3.d b/gas/testsuite/gas/mips/elf-rel3.d
index d73df8a..51dc0af 100644
--- a/gas/testsuite/gas/mips/elf-rel3.d
+++ b/gas/testsuite/gas/mips/elf-rel3.d
@@ -1,5 +1,6 @@
 #objdump: -sr -j .data
 #name: MIPS ELF reloc 3
+#as: -32
 
 .*:     file format elf.*mips
 
diff --git a/gas/testsuite/gas/mips/elf-rel4.d b/gas/testsuite/gas/mips/elf-rel4.d
index 005075b..759d962 100644
--- a/gas/testsuite/gas/mips/elf-rel4.d
+++ b/gas/testsuite/gas/mips/elf-rel4.d
@@ -1,5 +1,6 @@
 #objdump: --prefix-addresses -dr
 #name: MIPS ELF reloc 4
+#as: -32
 
 .*: +file format.*
 
diff --git a/gas/testsuite/gas/mips/elf-rel5.d b/gas/testsuite/gas/mips/elf-rel5.d
index a8b3bd3..3f04813 100644
--- a/gas/testsuite/gas/mips/elf-rel5.d
+++ b/gas/testsuite/gas/mips/elf-rel5.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS ELF reloc 5
+#as: -32
 
 .*: +file format elf.*mips.*
 
diff --git a/gas/testsuite/gas/mips/elf-rel6.d b/gas/testsuite/gas/mips/elf-rel6.d
index 3ff37b2..85efe9d 100644
--- a/gas/testsuite/gas/mips/elf-rel6.d
+++ b/gas/testsuite/gas/mips/elf-rel6.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF reloc 6
+#as: -32
 
 .*: +file format elf.*mips.*
 
diff --git a/gas/testsuite/gas/mips/elf-rel7.d b/gas/testsuite/gas/mips/elf-rel7.d
index d72ae15..58d0cff 100644
--- a/gas/testsuite/gas/mips/elf-rel7.d
+++ b/gas/testsuite/gas/mips/elf-rel7.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS ELF reloc 7
+#as: -32
 
 .*: +file format elf.*mips.*
 
diff --git a/gas/testsuite/gas/mips/elf_arch_mips1.d b/gas/testsuite/gas/mips/elf_arch_mips1.d
index 14a227e..a7af692 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips1.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips1.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS1 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips1
+# as: -32 -march=mips1
 
 .*:.*file format.*elf.*mips.*
 # Note: objdump omits leading zeros, so must check for the fact that
diff --git a/gas/testsuite/gas/mips/elf_arch_mips2.d b/gas/testsuite/gas/mips/elf_arch_mips2.d
index 3f72604..c2c0c54 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips2.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips2.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS2 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips2
+# as: -32 -march=mips2
 
 .*:.*file format.*elf.*mips.*
 private flags = 1.......: .*\[mips2\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips3.d b/gas/testsuite/gas/mips/elf_arch_mips3.d
index c46488c..cf42635 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips3.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips3.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS3 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips3
+# as: -32 -march=mips3
 
 .*:.*file format.*elf.*mips.*
 private flags = 2.......: .*\[mips3\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips32.d b/gas/testsuite/gas/mips/elf_arch_mips32.d
index c242506..0c4bc93 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips32.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips32.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS32 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips32
+# as: -32 -march=mips32
 
 .*:.*file format.*elf.*mips.*
 private flags = 5.......: .*\[mips32\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips32r2.d b/gas/testsuite/gas/mips/elf_arch_mips32r2.d
index 5491205..b0044ba 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips32r2.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips32r2.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS32r2 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips32r2
+# as: -32 -march=mips32r2
 
 .*:.*file format.*elf.*mips.*
 private flags = 7.......: .*\[mips32r2\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips4.d b/gas/testsuite/gas/mips/elf_arch_mips4.d
index 8dc52bf..d465582 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips4.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips4.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS4 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips4
+# as: -32 -march=mips4
 
 .*:.*file format.*elf.*mips.*
 private flags = 3.......: .*\[mips4\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips5.d b/gas/testsuite/gas/mips/elf_arch_mips5.d
index d38b02c..39327ae 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips5.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips5.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS5 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips5
+# as: -32 -march=mips5
 
 .*:.*file format.*elf.*mips.*
 private flags = 4.......: .*\[mips5\].*
diff --git a/gas/testsuite/gas/mips/elf_arch_mips64.d b/gas/testsuite/gas/mips/elf_arch_mips64.d
index 52c8927..c3aea0f 100644
--- a/gas/testsuite/gas/mips/elf_arch_mips64.d
+++ b/gas/testsuite/gas/mips/elf_arch_mips64.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS64 markings
 # source: empty.s
 # objdump: -p
-# as: -march=mips64
+# as: -32 -march=mips64
 
 .*:.*file format.*elf.*mips.*
 private flags = 6.......: .*\[mips64\].*
diff --git a/gas/testsuite/gas/mips/elf_ase_mips16.d b/gas/testsuite/gas/mips/elf_ase_mips16.d
index 82887f7..74bb987 100644
--- a/gas/testsuite/gas/mips/elf_ase_mips16.d
+++ b/gas/testsuite/gas/mips/elf_ase_mips16.d
@@ -1,7 +1,7 @@
 # name: ELF MIPS16 ASE markings
 # source: empty.s
 # objdump: -p
-# as: -mips16
+# as: -32 -mips16
 
 .*:.*file format.*mips.*
 private flags = [0-9a-f]*[4-7c-f]......: .*[[,]mips16[],].*
diff --git a/gas/testsuite/gas/mips/empic.d b/gas/testsuite/gas/mips/empic.d
index 20385f7..5a40d5d 100644
--- a/gas/testsuite/gas/mips/empic.d
+++ b/gas/testsuite/gas/mips/empic.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mmips:4000
 #name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 #stderr: empic.l
 
 # Check GNU-specific embedded relocs, for ELF.
diff --git a/gas/testsuite/gas/mips/empic2.d b/gas/testsuite/gas/mips/empic2.d
index 0d1e573..de691b1 100644
--- a/gas/testsuite/gas/mips/empic2.d
+++ b/gas/testsuite/gas/mips/empic2.d
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic2
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check assembly of and relocs for -membedded-pic la, lw, ld, sw, sd macros.
 
diff --git a/gas/testsuite/gas/mips/empic3_e.d b/gas/testsuite/gas/mips/empic3_e.d
index 24ec944..d491e47 100644
--- a/gas/testsuite/gas/mips/empic3_e.d
+++ b/gas/testsuite/gas/mips/empic3_e.d
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (external)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
diff --git a/gas/testsuite/gas/mips/empic3_g1.d b/gas/testsuite/gas/mips/empic3_g1.d
index 3e0f5ba..fde87e0 100644
--- a/gas/testsuite/gas/mips/empic3_g1.d
+++ b/gas/testsuite/gas/mips/empic3_g1.d
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (global, negative)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
diff --git a/gas/testsuite/gas/mips/empic3_g2.d b/gas/testsuite/gas/mips/empic3_g2.d
index 2a6a452..08b5e4b 100644
--- a/gas/testsuite/gas/mips/empic3_g2.d
+++ b/gas/testsuite/gas/mips/empic3_g2.d
@@ -1,6 +1,6 @@
 #objdump: --prefix-addresses -dr --show-raw-insn -mmips:4000
 #name: MIPS empic3 (global, positive)
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 
 # Check PC-relative HI/LO relocs relocs for -membedded-pic when HI and
 # LO are split over a 32K boundary.
diff --git a/gas/testsuite/gas/mips/hwr-names-mips32r2.d b/gas/testsuite/gas/mips/hwr-names-mips32r2.d
index 93333e3..c7c07a2 100644
--- a/gas/testsuite/gas/mips/hwr-names-mips32r2.d
+++ b/gas/testsuite/gas/mips/hwr-names-mips32r2.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=mips32r2
 #name: MIPS HWR disassembly (mips32r2)
-#as: -mips32r2
+#as: -32 -mips32r2
 #source: hwr-names.s
 
 # Check objdump's handling of -M hwr-names=foo options.
diff --git a/gas/testsuite/gas/mips/hwr-names-numeric.d b/gas/testsuite/gas/mips/hwr-names-numeric.d
index 71a9700..5a7bc8d 100644
--- a/gas/testsuite/gas/mips/hwr-names-numeric.d
+++ b/gas/testsuite/gas/mips/hwr-names-numeric.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa32r2 -M gpr-names=numeric,hwr-names=numeric
 #name: MIPS HWR disassembly (numeric)
-#as: -mips32r2
+#as: -32 -mips32r2
 #source: hwr-names.s
 
 # Check objdump's handling of -M hwr-names=foo options.
diff --git a/gas/testsuite/gas/mips/jal-empic-elf-2.d b/gas/testsuite/gas/mips/jal-empic-elf-2.d
index 5d93b62..7e9623e 100644
--- a/gas/testsuite/gas/mips/jal-empic-elf-2.d
+++ b/gas/testsuite/gas/mips/jal-empic-elf-2.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf-2
-#as: -membedded-pic
+#as: -32 -membedded-pic
 
 # Test the jal macro harder with -membedded-pic.
 
diff --git a/gas/testsuite/gas/mips/jal-empic-elf-3.d b/gas/testsuite/gas/mips/jal-empic-elf-3.d
index 58b1ec0..0f6a11a 100644
--- a/gas/testsuite/gas/mips/jal-empic-elf-3.d
+++ b/gas/testsuite/gas/mips/jal-empic-elf-3.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf-3
-#as: -membedded-pic
+#as: -32 -membedded-pic
 
 # Test the jal macro harder with -membedded-pic.
 
diff --git a/gas/testsuite/gas/mips/jal-empic-elf.d b/gas/testsuite/gas/mips/jal-empic-elf.d
index 31344cb..2502223 100644
--- a/gas/testsuite/gas/mips/jal-empic-elf.d
+++ b/gas/testsuite/gas/mips/jal-empic-elf.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS jal-empic-elf
-#as: -membedded-pic
+#as: -32 -membedded-pic
 #source: jal.s
 
 # Test the jal macro with -membedded-pic.
diff --git a/gas/testsuite/gas/mips/jal-svr4pic.d b/gas/testsuite/gas/mips/jal-svr4pic.d
index 72eda5b..72ab5c9 100644
--- a/gas/testsuite/gas/mips/jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-svr4pic
-#as: -mips1 -KPIC -mtune=r3000
+#as: -32 -mips1 -KPIC -mtune=r3000
 
 # Test the jal macro with -KPIC.
 
diff --git a/gas/testsuite/gas/mips/jal-xgot.d b/gas/testsuite/gas/mips/jal-xgot.d
index 2f320d6..caab1f5 100644
--- a/gas/testsuite/gas/mips/jal-xgot.d
+++ b/gas/testsuite/gas/mips/jal-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
 #source: jal-svr4pic.s
 
 # Test the jal macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/jal.d b/gas/testsuite/gas/mips/jal.d
index 8b8e155..eda0826 100644
--- a/gas/testsuite/gas/mips/jal.d
+++ b/gas/testsuite/gas/mips/jal.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS jal
+#as: -32
 
 # Test the jal macro.
 
diff --git a/gas/testsuite/gas/mips/la-empic.d b/gas/testsuite/gas/mips/la-empic.d
index c686609..3bee777 100644
--- a/gas/testsuite/gas/mips/la-empic.d
+++ b/gas/testsuite/gas/mips/la-empic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 
 # Test the la macro with -membedded-pic.
 
diff --git a/gas/testsuite/gas/mips/la-svr4pic.d b/gas/testsuite/gas/mips/la-svr4pic.d
index 49fff59..698b57c 100644
--- a/gas/testsuite/gas/mips/la-svr4pic.d
+++ b/gas/testsuite/gas/mips/la-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-svr4pic
-#as: -mips1 -KPIC --defsym KPIC=1
+#as: -32 -mips1 -KPIC --defsym KPIC=1
 #source: la.s
 
 # Test the la macro with -KPIC.
diff --git a/gas/testsuite/gas/mips/la-xgot.d b/gas/testsuite/gas/mips/la-xgot.d
index f3b88ad..5a72452 100644
--- a/gas/testsuite/gas/mips/la-xgot.d
+++ b/gas/testsuite/gas/mips/la-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la-xgot
-#as: -mips1 -KPIC -xgot --defsym KPIC=1
+#as: -32 -mips1 -KPIC -xgot --defsym KPIC=1
 #source: la.s
 
 # Test the la macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/la.d b/gas/testsuite/gas/mips/la.d
index 063e910..449c6a2 100644
--- a/gas/testsuite/gas/mips/la.d
+++ b/gas/testsuite/gas/mips/la.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS la
-#as: -mips1
+#as: -32 -mips1
 
 # Test the la macro.
 
diff --git a/gas/testsuite/gas/mips/lb-empic.d b/gas/testsuite/gas/mips/lb-empic.d
index e06b9b1..75cbeb3 100644
--- a/gas/testsuite/gas/mips/lb-empic.d
+++ b/gas/testsuite/gas/mips/lb-empic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 #source: lb-pic.s
 
 # Test the lb macro with -membedded-pic.
diff --git a/gas/testsuite/gas/mips/lb-svr4pic.d b/gas/testsuite/gas/mips/lb-svr4pic.d
index 8c29278..5dd0e77 100644
--- a/gas/testsuite/gas/mips/lb-svr4pic.d
+++ b/gas/testsuite/gas/mips/lb-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS lb-svr4pic
-#as: -KPIC
+#as: -32 -KPIC
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC.
diff --git a/gas/testsuite/gas/mips/lb-xgot-ilocks.d b/gas/testsuite/gas/mips/lb-xgot-ilocks.d
index 5c3ec63..b2632bc 100644
--- a/gas/testsuite/gas/mips/lb-xgot-ilocks.d
+++ b/gas/testsuite/gas/mips/lb-xgot-ilocks.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot-ilocks
-#as: -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
+#as: -32 -mips1 -KPIC -xgot -mtune=r3900 -march=r3900
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lb-xgot.d b/gas/testsuite/gas/mips/lb-xgot.d
index 27dfad5..c223cbf 100644
--- a/gas/testsuite/gas/mips/lb-xgot.d
+++ b/gas/testsuite/gas/mips/lb-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot
-#as: -mips1 -KPIC -xgot -mtune=r3000
+#as: -32 -mips1 -KPIC -xgot -mtune=r3000
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lb.d b/gas/testsuite/gas/mips/lb.d
index 20656f2..ccc28cb 100644
--- a/gas/testsuite/gas/mips/lb.d
+++ b/gas/testsuite/gas/mips/lb.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS lb
+#as: -32
 
 # Test the lb macro.
 
diff --git a/gas/testsuite/gas/mips/ld-empic.d b/gas/testsuite/gas/mips/ld-empic.d
index f7d4916..85c8358 100644
--- a/gas/testsuite/gas/mips/ld-empic.d
+++ b/gas/testsuite/gas/mips/ld-empic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
 #source: ld-pic.s
 
 # Test the ld macro with -membedded-pic.
diff --git a/gas/testsuite/gas/mips/ld-svr4pic.d b/gas/testsuite/gas/mips/ld-svr4pic.d
index b41b257..737892c 100644
--- a/gas/testsuite/gas/mips/ld-svr4pic.d
+++ b/gas/testsuite/gas/mips/ld-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC
+#as: -32 -mips1 -mtune=r3000 -KPIC
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC.
diff --git a/gas/testsuite/gas/mips/ld-xgot.d b/gas/testsuite/gas/mips/ld-xgot.d
index d5456ba..ddf62a8 100644
--- a/gas/testsuite/gas/mips/ld-xgot.d
+++ b/gas/testsuite/gas/mips/ld-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index 4dea809..d3c3ca1 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -march=r4000
+#as: -32 -march=r4000
 #name: MIPS ld
 
 # Test the ld macro.
diff --git a/gas/testsuite/gas/mips/li.d b/gas/testsuite/gas/mips/li.d
index 7c3dfc3..4beed9b 100644
--- a/gas/testsuite/gas/mips/li.d
+++ b/gas/testsuite/gas/mips/li.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS li
+#as: -32
 
 # Test the li macro.
 
diff --git a/gas/testsuite/gas/mips/lif-empic.d b/gas/testsuite/gas/mips/lif-empic.d
index f0a97bf..f81b68d 100644
--- a/gas/testsuite/gas/mips/lif-empic.d
+++ b/gas/testsuite/gas/mips/lif-empic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-empic
-#as: -mips1 -membedded-pic --defsym EMPIC=1
+#as: -32 -mips1 -membedded-pic --defsym EMPIC=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -membedded-pic.
diff --git a/gas/testsuite/gas/mips/lif-svr4pic.d b/gas/testsuite/gas/mips/lif-svr4pic.d
index 9432ecc..84d0e7b 100644
--- a/gas/testsuite/gas/mips/lif-svr4pic.d
+++ b/gas/testsuite/gas/mips/lif-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-svr4pic
-#as: -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC.
diff --git a/gas/testsuite/gas/mips/lif-xgot.d b/gas/testsuite/gas/mips/lif-xgot.d
index 9056c62..d53a5ba 100644
--- a/gas/testsuite/gas/mips/lif-xgot.d
+++ b/gas/testsuite/gas/mips/lif-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lifloat.d b/gas/testsuite/gas/mips/lifloat.d
index 31cda97..3f0c161 100644
--- a/gas/testsuite/gas/mips/lifloat.d
+++ b/gas/testsuite/gas/mips/lifloat.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat
-#as: -mips1
+#as: -32 -mips1
 
 # Test the li.d and li.s macros.
 
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
index a34a96d..0530246 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp32 -KPIC
 #name: MIPS -mgp32 -mfp32 (SVR4 PIC)
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32.d b/gas/testsuite/gas/mips/mips-gp32-fp32.d
index 700db85..ab943f1 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp32
+#as: -32 -march=8000 -EB -mgp32 -mfp32
 #name: MIPS -mgp32 -mfp32
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
index 7dee0c0..5ed7df0 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64 -KPIC
+#as: -32 -march=8000 -EB -mgp32 -mfp64 -KPIC
 #name: MIPS -mgp32 -mfp64 (SVR4 PIC)
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64.d b/gas/testsuite/gas/mips/mips-gp32-fp64.d
index 8104990..b266f70 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mgp32 -mfp64
+#as: -32 -march=8000 -EB -mgp32 -mfp64
 #name: MIPS -mgp32 -mfp64
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
index a05e1e0..db6c76b 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32 -KPIC
+#as: -mabi=o64 -march=8000 -EB -mfp32 -KPIC
 #name: MIPS -mgp64 -mfp32 (SVR4 PIC)
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
index 6faf9b8..39b490e 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -mfp32
+#as: -mabi=o64 -march=8000 -EB -mfp32
 #name: MIPS -mgp64 -mfp32
 #stderr: mips-gp64-fp32.l
 
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
index 0e95795..f66ea4e 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB -KPIC
+#as: -mabi=o64 -march=8000 -EB -KPIC
 #name: MIPS -mgp64 -mfp64 (SVR4 PIC)
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
index cba98f0..bf3e44f 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.d
@@ -1,5 +1,5 @@
 #objdump: -d -mmips:8000
-#as: -march=8000 -EB
+#as: -mabi=o64 -march=8000 -EB
 #name: MIPS -mgp64 -mfp64
 #stderr: mips-gp64-fp32.l
 
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 3df1a12..7e8a25d 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -423,7 +423,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test_arches "blt"		[mips_arch_list_matching mips2]
     run_dump_test_arches "bltu"		[mips_arch_list_matching mips2]
     run_dump_test_arches "branch-misc-1" [mips_arch_list_matching mips1]
-    run_list_test_arches "branch-misc-2" "" [mips_arch_list_matching mips1]
+    run_list_test_arches "branch-misc-2" "-32" [mips_arch_list_matching mips1]
 
     if $ilocks {
 	run_dump_test "div-ilocks"
@@ -447,7 +447,7 @@ if { [istarget mips*-*-*] } then {
 	run_dump_test_arches "jal-empic-elf-2" [mips_arch_list_matching mips1]
 	run_dump_test_arches "jal-empic-elf-3" [mips_arch_list_matching mips1]
     }
-    run_list_test_arches "jal-range" ""	[mips_arch_list_matching mips1]
+    run_list_test_arches "jal-range" "-32" [mips_arch_list_matching mips1]
     if !$aout { run_dump_test "la" }
     if $elf { run_dump_test "la-svr4pic" }
     if $elf { run_dump_test "la-xgot" }
@@ -537,7 +537,7 @@ if { [istarget mips*-*-*] } then {
 	run_dump_test "mips16-jalx"
 	run_dump_test "mips-jalx"
     }
-    run_list_test "mips-no-jalx" ""
+    run_list_test "mips-no-jalx" "-32"
     run_dump_test "delay"
     run_dump_test "nodelay"
     run_dump_test "mips4010"
@@ -555,7 +555,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test_arches "mips32"	[mips_arch_list_matching mips32]
 
     run_dump_test_arches "mips32r2"	[mips_arch_list_matching mips32r2]
-    run_list_test_arches "mips32r2-ill" "" [mips_arch_list_matching mips32r2]
+    run_list_test_arches "mips32r2-ill" "-32" [mips_arch_list_matching mips32r2]
 
     run_dump_test_arches "mips64"	[mips_arch_list_matching mips64]
 
@@ -568,8 +568,8 @@ if { [istarget mips*-*-*] } then {
 
     run_dump_test "relax"
 
-    run_list_test "illegal" ""
-    run_list_test "baddata1" ""
+    run_list_test "illegal" "-32"
+    run_list_test "baddata1" "-32"
 
     # LOSE: As of 2002-02-08, the next 4 tests fail for target mips-ecoff.
     # It's unknown whether they _should_ pass as-is, or whether different
diff --git a/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d
index 13788fd..49a1705 100644
--- a/gas/testsuite/gas/mips/mips16-e.d
+++ b/gas/testsuite/gas/mips/mips16-e.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 
 # Check MIPS16 reloc processing
 
diff --git a/gas/testsuite/gas/mips/mips16-f.d b/gas/testsuite/gas/mips/mips16-f.d
index 3f9d616..c98b04d 100644
--- a/gas/testsuite/gas/mips/mips16-f.d
+++ b/gas/testsuite/gas/mips/mips16-f.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 
 # Check MIPS16 reloc processing
 
diff --git a/gas/testsuite/gas/mips/mips32.d b/gas/testsuite/gas/mips/mips32.d
index 390117d..503a3e5 100644
--- a/gas/testsuite/gas/mips/mips32.d
+++ b/gas/testsuite/gas/mips/mips32.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS MIPS32 instructions
+#as: -32
 
 # Check MIPS32 instruction assembly
 
diff --git a/gas/testsuite/gas/mips/mips32r2.d b/gas/testsuite/gas/mips/mips32r2.d
index 1f70e9b..07c301c 100644
--- a/gas/testsuite/gas/mips/mips32r2.d
+++ b/gas/testsuite/gas/mips/mips32r2.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: MIPS MIPS32r2 instructions
+#as: -32
 
 # Check MIPS32 Release 2 (mips32r2) instruction assembly
 
diff --git a/gas/testsuite/gas/mips/mips4010.d b/gas/testsuite/gas/mips/mips4010.d
index 12e8ac1..a48560e 100644
--- a/gas/testsuite/gas/mips/mips4010.d
+++ b/gas/testsuite/gas/mips/mips4010.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4010
 #name: MIPS 4010
-#as: -march=4010
+#as: -32 -march=4010
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips4650.d b/gas/testsuite/gas/mips/mips4650.d
index 2e68a37..24a393b 100644
--- a/gas/testsuite/gas/mips/mips4650.d
+++ b/gas/testsuite/gas/mips/mips4650.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4650
 #name: MIPS 4650
-#as: -march=4650 -mtune=4650
+#as: -32 -march=4650 -mtune=4650
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips64.d b/gas/testsuite/gas/mips/mips64.d
index 1023d6b..97679eb 100644
--- a/gas/testsuite/gas/mips/mips64.d
+++ b/gas/testsuite/gas/mips/mips64.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS MIPS64 instructions
+#as: -32
 
 # Check MIPS64 instruction assembly
 
diff --git a/gas/testsuite/gas/mips/mipsel16-e.d b/gas/testsuite/gas/mips/mipsel16-e.d
index 7ac7e13..f8f5a37 100644
--- a/gas/testsuite/gas/mips/mipsel16-e.d
+++ b/gas/testsuite/gas/mips/mipsel16-e.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/mipsel16-f.d b/gas/testsuite/gas/mips/mipsel16-f.d
index 3247a7a..5de78ed 100644
--- a/gas/testsuite/gas/mips/mipsel16-f.d
+++ b/gas/testsuite/gas/mips/mipsel16-f.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/rol-hw.d b/gas/testsuite/gas/mips/rol-hw.d
index 8406aa8..347c7fb 100644
--- a/gas/testsuite/gas/mips/rol-hw.d
+++ b/gas/testsuite/gas/mips/rol-hw.d
@@ -2,6 +2,7 @@
 #name: MIPS hardware rol/ror
 #source: rol.s
 #stderr: rol-hw.l
+#as: -32
 
 # Test the rol and ror macros.
 
diff --git a/gas/testsuite/gas/mips/rol.d b/gas/testsuite/gas/mips/rol.d
index f03ba4c..c226777 100644
--- a/gas/testsuite/gas/mips/rol.d
+++ b/gas/testsuite/gas/mips/rol.d
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS macro rol/ror
 #stderr: rol.l
+#as: -32
 
 # Test the rol and ror macros.
 
diff --git a/gas/testsuite/gas/mips/sb.d b/gas/testsuite/gas/mips/sb.d
index 3c839db..627c658 100644
--- a/gas/testsuite/gas/mips/sb.d
+++ b/gas/testsuite/gas/mips/sb.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS sb
-#as: -mips1
+#as: -32 -mips1
 
 # Test the sb macro.
 
diff --git a/gas/testsuite/gas/mips/sync.d b/gas/testsuite/gas/mips/sync.d
index 6b70cbb..cd3b4b0 100644
--- a/gas/testsuite/gas/mips/sync.d
+++ b/gas/testsuite/gas/mips/sync.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: sync instructions
-#as: -mips2
+#as: -32 -mips2
 
 .*: +file format .*mips.*
 
diff --git a/gas/testsuite/gas/mips/tempic.d b/gas/testsuite/gas/mips/tempic.d
index 71f2ca5..5efa955 100644
--- a/gas/testsuite/gas/mips/tempic.d
+++ b/gas/testsuite/gas/mips/tempic.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mmips:4000
 #name: MIPS empic
-#as: -membedded-pic -mips3
+#as: -mabi=o64 -membedded-pic -mips3
 #source: empic.s
 #stderr: empic.l
 
diff --git a/gas/testsuite/gas/mips/tmips16-e.d b/gas/testsuite/gas/mips/tmips16-e.d
index 8847fe4..bad8388 100644
--- a/gas/testsuite/gas/mips/tmips16-e.d
+++ b/gas/testsuite/gas/mips/tmips16-e.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/tmips16-f.d b/gas/testsuite/gas/mips/tmips16-f.d
index a6d4491..63c85d1 100644
--- a/gas/testsuite/gas/mips/tmips16-f.d
+++ b/gas/testsuite/gas/mips/tmips16-f.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/tmipsel16-e.d b/gas/testsuite/gas/mips/tmipsel16-e.d
index 107902e..dbabb7a 100644
--- a/gas/testsuite/gas/mips/tmipsel16-e.d
+++ b/gas/testsuite/gas/mips/tmipsel16-e.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-e.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/tmipsel16-f.d b/gas/testsuite/gas/mips/tmipsel16-f.d
index 969d259..f6402df 100644
--- a/gas/testsuite/gas/mips/tmipsel16-f.d
+++ b/gas/testsuite/gas/mips/tmipsel16-f.d
@@ -1,6 +1,6 @@
 #objdump: -rst -mips16
 #name: MIPS16 reloc 2
-#as: -mips16
+#as: -32 -mips16
 #source: mips16-f.s
 
 # Check MIPS16 reloc processing
diff --git a/gas/testsuite/gas/mips/trunc.d b/gas/testsuite/gas/mips/trunc.d
index 324650e..64cc941 100644
--- a/gas/testsuite/gas/mips/trunc.d
+++ b/gas/testsuite/gas/mips/trunc.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS trunc
-#as: -mips1 -mtune=r3000
+#as: -32 -mips1 -mtune=r3000
 
 # Test the trunc macros.
 
diff --git a/gas/testsuite/gas/mips/uld.d b/gas/testsuite/gas/mips/uld.d
index 88551f8..6d665e4 100644
--- a/gas/testsuite/gas/mips/uld.d
+++ b/gas/testsuite/gas/mips/uld.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS uld
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
 
 # Test the uld macro.
 
diff --git a/gas/testsuite/gas/mips/ulh-empic.d b/gas/testsuite/gas/mips/ulh-empic.d
index 133b32c..1f1a337 100644
--- a/gas/testsuite/gas/mips/ulh-empic.d
+++ b/gas/testsuite/gas/mips/ulh-empic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-empic
-#as: -mips1 -membedded-pic
+#as: -32 -mips1 -membedded-pic
 #source: ulh-pic.s
 
 # Test the ulh macro with -membedded-pic.
diff --git a/gas/testsuite/gas/mips/ulh-svr4pic.d b/gas/testsuite/gas/mips/ulh-svr4pic.d
index c24e9a6..5c75468 100644
--- a/gas/testsuite/gas/mips/ulh-svr4pic.d
+++ b/gas/testsuite/gas/mips/ulh-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-svr4pic
-#as: -mips1 -KPIC -EB
+#as: -32 -mips1 -KPIC -EB
 #source: ulh-pic.s
 
 # Test the unaligned load and store macros with -KPIC.
diff --git a/gas/testsuite/gas/mips/ulh-xgot.d b/gas/testsuite/gas/mips/ulh-xgot.d
index 4ee5b6b..0a3d230 100644
--- a/gas/testsuite/gas/mips/ulh-xgot.d
+++ b/gas/testsuite/gas/mips/ulh-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-xgot
-#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -32 -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: ulh-pic.s
 
 # Test the unaligned load and store macros with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/ulh.d b/gas/testsuite/gas/mips/ulh.d
index df5a57b..dbe4a73 100644
--- a/gas/testsuite/gas/mips/ulh.d
+++ b/gas/testsuite/gas/mips/ulh.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ulh macro.
 
diff --git a/gas/testsuite/gas/mips/ulh2-eb.d b/gas/testsuite/gas/mips/ulh2-eb.d
index d822fce..9c8e84c 100644
--- a/gas/testsuite/gas/mips/ulh2-eb.d
+++ b/gas/testsuite/gas/mips/ulh2-eb.d
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulh2 -EB
 #source: ulh2.s
diff --git a/gas/testsuite/gas/mips/ulh2-el.d b/gas/testsuite/gas/mips/ulh2-el.d
index 0f5d369..e8e47e8 100644
--- a/gas/testsuite/gas/mips/ulh2-el.d
+++ b/gas/testsuite/gas/mips/ulh2-el.d
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulh2 -EL
 #source: ulh2.s
diff --git a/gas/testsuite/gas/mips/ulw.d b/gas/testsuite/gas/mips/ulw.d
index cbd0f77..7d2bec0 100644
--- a/gas/testsuite/gas/mips/ulw.d
+++ b/gas/testsuite/gas/mips/ulw.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulw
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ulw macro.
 
diff --git a/gas/testsuite/gas/mips/ulw2-eb-ilocks.d b/gas/testsuite/gas/mips/ulw2-eb-ilocks.d
index 7526909..83796ef 100644
--- a/gas/testsuite/gas/mips/ulw2-eb-ilocks.d
+++ b/gas/testsuite/gas/mips/ulw2-eb-ilocks.d
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulw2 -EB interlocked
 #source: ulw2.s
diff --git a/gas/testsuite/gas/mips/ulw2-eb.d b/gas/testsuite/gas/mips/ulw2-eb.d
index cb7cae6..88839bd 100644
--- a/gas/testsuite/gas/mips/ulw2-eb.d
+++ b/gas/testsuite/gas/mips/ulw2-eb.d
@@ -1,4 +1,4 @@
-#as: -EB
+#as: -EB -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulw2 -EB non-interlocked
 #source: ulw2.s
diff --git a/gas/testsuite/gas/mips/ulw2-el-ilocks.d b/gas/testsuite/gas/mips/ulw2-el-ilocks.d
index cce9fb7..cc96c62 100644
--- a/gas/testsuite/gas/mips/ulw2-el-ilocks.d
+++ b/gas/testsuite/gas/mips/ulw2-el-ilocks.d
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulw2 -EL interlocked
 #source: ulw2.s
diff --git a/gas/testsuite/gas/mips/ulw2-el.d b/gas/testsuite/gas/mips/ulw2-el.d
index 59039a8..6abd4d0 100644
--- a/gas/testsuite/gas/mips/ulw2-el.d
+++ b/gas/testsuite/gas/mips/ulw2-el.d
@@ -1,4 +1,4 @@
-#as: -EL
+#as: -EL -32
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: ulw2 -EL non-interlocked
 #source: ulw2.s
diff --git a/gas/testsuite/gas/mips/usd.d b/gas/testsuite/gas/mips/usd.d
index d3631a9..23855bb 100644
--- a/gas/testsuite/gas/mips/usd.d
+++ b/gas/testsuite/gas/mips/usd.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS usd
-#as: -mips3 -mtune=r4000
+#as: -32 -mips3 -mtune=r4000
 
 # Test the usd macro.
 
diff --git a/gas/testsuite/gas/mips/ush.d b/gas/testsuite/gas/mips/ush.d
index de23e61..c2d95f2 100644
--- a/gas/testsuite/gas/mips/ush.d
+++ b/gas/testsuite/gas/mips/ush.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ush
-#as: -mips1
+#as: -32 -mips1
 
 # Test the ush macro.
 
diff --git a/gas/testsuite/gas/mips/usw.d b/gas/testsuite/gas/mips/usw.d
index e500792..7c25390 100644
--- a/gas/testsuite/gas/mips/usw.d
+++ b/gas/testsuite/gas/mips/usw.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS usw
-#as: -mips1
+#as: -32 -mips1
 
 # Test the usw macro.
 
diff --git a/gas/testsuite/gas/mips/vr4122.d b/gas/testsuite/gas/mips/vr4122.d
index 7c03a2d..9ff3b6d 100644
--- a/gas/testsuite/gas/mips/vr4122.d
+++ b/gas/testsuite/gas/mips/vr4122.d
@@ -1,5 +1,5 @@
 #objdump: -dz --prefix-addresses -m mips:4120
-#as: -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
+#as: -32 -march=vr4120 -mtune=vr4120 -mfix-vr4122-bugs
 #name: MIPS vr4122 workarounds
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/vtable/vtable.exp b/gas/testsuite/gas/vtable/vtable.exp
index d5a797e..0b50921 100644
--- a/gas/testsuite/gas/vtable/vtable.exp
+++ b/gas/testsuite/gas/vtable/vtable.exp
@@ -42,7 +42,9 @@ if { (   [istarget "*-*-elf*"] || [istarget "*-*-linux*"])
 	|| [istarget "dlx-*"]
 	|| [istarget "i*86-*"] 
 	|| [istarget "m32r-*"] 
-	|| [istarget "mips*-*"] 
+	|| ([istarget "mips*-*"]
+	    && ! [istarget "mips64*-*-linux*"]
+	    && ! [istarget "mips*-*-irix6*"])
 	|| [istarget "m68hc*-*"] 
 	|| [istarget "or32-*"] 
 	|| [istarget "strongarm*-*"]