diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8b9bec76d2..45639d3429 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,72 @@
+2014-09-06  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+	* ld-mips-elf/abiflags-strip1-ph.d: Ignore big/little endian
+	differences. Ignore program headers other than PT_MIPS_ABIFLAGS.
+	Do not force -32, -EB and ld emulation but instead rely on the
+	test driver to build for some form of O32.
+	* ld-mips-elf/abiflags-strip2-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip3-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip4-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip5-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip6-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip7-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip8-ph.d: Likewise.
+	* ld-mips-elf/abiflags-strip9-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-0-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-05.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-06.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-07.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-1-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-10.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-15.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-16.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-17.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-2-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-25.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-26.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-27.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-3-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-35.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-36.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-37.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-4-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-45.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-46.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-47.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-5-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-50.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-51.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-52.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-53.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-54.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-55.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-56.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-57.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-58.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-6-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-60.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-61.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-62.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-63.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-64.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-65.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-66.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-67.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-68.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-7-ph.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-70.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-71.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-72.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-73.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-74.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-75.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-76.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-77.d: Likewise.
+	* ld-mips-elf/attr-gnu-4-78.d: Likewise.
+	* ld-mips-elf/mips-elf.exp: Update default abi_asflags(o32) to explicitly
+	pass -32 for the 'no abi' configurations.  Modify the way attr-gnu* tests
+	are run to use O32 flags appropriate for the current target.
+
 2014-08-29  Alan Modra  <amodra@gmail.com>
 
 	* lib/ld-lib.exp (ld_simple_link_defsyms): Provide both __main
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip1-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip1-ph.d
index 3af3433ec4..2d437b305a 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip1-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip1-ph.d
@@ -1,9 +1,9 @@
-#source: jr.s -mips32r2 -32 -mfp32 -EB RUN_OBJCOPY
+#source: jr.s -mips32r2 -mfp32 RUN_OBJCOPY
 #objcopy_objects: -R .MIPS.abiflags
-#ld: -melf32btsmip -e 0
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
 #...
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip2-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip2-ph.d
index 1da784058a..373aa07822 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip2-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip2-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#source: jr.s -march=octeon -32 -mfp64 -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r2 -mfpxx
+#source: jr.s -march=octeon -mfp64 RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 808b1100: \[abi=O32\] \[mips64r2\] \[32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip3-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip3-ph.d
index df5640a17b..98a3c408ed 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip3-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip3-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -march=octeon -32 -mfp64 -EB RUN_OBJCOPY
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#ld: -melf32btsmip -e 0
+#source: jr.s -march=octeon -mfp64 RUN_OBJCOPY
+#source: jr.s -mips32r2 -mfpxx
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 808b1100: \[abi=O32\] \[mips64r2\] \[32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip4-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip4-ph.d
index 09ceadf077..62f9fb952c 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip4-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip4-ph.d
@@ -1,19 +1,17 @@
-#source: jr.s -march=octeon -32 -mfp64 -EB -mdmx RUN_OBJCOPY
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#source: jr.s -mips32r2 -32 -mfp64 -mno-odd-spreg -mmsa -EB
-#source: jr.s -mips2 -32 -mfpxx -mips16 -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -march=octeon -mfp64 -mdmx RUN_OBJCOPY
+#source: jr.s -mips32r2 -mfpxx
+#source: jr.s -mips32r2 -mfp64 -mno-odd-spreg -mmsa
+#source: jr.s -mips2 -mfpxx -mips16 RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x00000... memsz 0x00000... flags r-x
 private flags = 8c8b1100: \[abi=O32\] \[mips64r2\] \[mdmx\] \[mips16\] \[32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip5-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip5-ph.d
index bde70966ca..9381d46abd 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip5-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip5-ph.d
@@ -1,19 +1,17 @@
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#source: jr.s -mips32r2 -32 -mfp64 -mmsa -EB
-#source: jr.s -march=octeon -32 -mfp64 -EB -mdmx RUN_OBJCOPY
-#source: jr.s -mips2 -32 -mips16 -mfpxx -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r2 -mfpxx
+#source: jr.s -mips32r2 -mfp64 -mmsa
+#source: jr.s -march=octeon -mfp64 -mdmx RUN_OBJCOPY
+#source: jr.s -mips2 -mips16 -mfpxx RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x00000... memsz 0x00000... flags r-x
 private flags = 8c8b1100: \[abi=O32\] \[mips64r2\] \[mdmx\] \[mips16\] \[32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip6-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip6-ph.d
index 3abb3364c4..ef4c9ca6bb 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip6-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip6-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -mips32r3 -32 -EB RUN_OBJCOPY
-#source: jr.s -mips32r2 -32 -EB
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r3 RUN_OBJCOPY
+#source: jr.s -mips32r2
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip7-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip7-ph.d
index d8f5dc5e52..9cb73c9e0e 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip7-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip7-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -mips32r3 -32 -EB
-#source: jr.s -mips32r2 -32 -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r3
+#source: jr.s -mips32r2 RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .MIPS.abiflags
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip8-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip8-ph.d
index 840dc59da2..b2e1d5f145 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip8-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip8-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#source: jr.s -mips32r2 -32 -mfp64 -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r2 -mfpxx
+#source: jr.s -mips32r2 -mfp64 RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .gnu.attributes
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/abiflags-strip9-ph.d b/ld/testsuite/ld-mips-elf/abiflags-strip9-ph.d
index f42961beb2..729792706b 100644
--- a/ld/testsuite/ld-mips-elf/abiflags-strip9-ph.d
+++ b/ld/testsuite/ld-mips-elf/abiflags-strip9-ph.d
@@ -1,17 +1,15 @@
-#source: jr.s -mips32r2 -32 -mfpxx -EB
-#source: jr.s -mips32r2 -32 -mfp64 -mno-odd-spreg -EB RUN_OBJCOPY
-#ld: -melf32btsmip -e 0
+#source: jr.s -mips32r2 -mfpxx
+#source: jr.s -mips32r2 -mfp64 -mno-odd-spreg RUN_OBJCOPY
+#ld: -e 0
 #objcopy_objects: -R .gnu.attributes
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r-x
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-ph.d
index eb33a70846..c3127d3374 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-ph.d
@@ -1,15 +1,13 @@
-#source: attr-gnu-4-0.s -mips32r2 -32 -EB
-#ld: -melf32btsmip -e 0
+#source: attr-gnu-4-0.s -mips32r2
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
index 46b9480544..65101693f5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-0.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-0.s -mips32r2
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-06.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-06.d
index c23c0dc536..1a3c3a8574 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-06.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-06.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-0.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-0.s -mips32r2
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-07.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-07.d
index 040c06fb6f..f98afbdf01 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-07.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-07.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-0.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-0.s -mips32r2
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-ph.d
index 7aacd6519a..dc1e5c7778 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -mfp32 -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -mfp32
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
index 0abd9d1ce3..2775e4d43e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
@@ -1,12 +1,12 @@
-#source: attr-gnu-4-1.s -EB -32
-#source: attr-gnu-4-0.s -EB -32
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-1.s
+#source: attr-gnu-4-0.s
+#ld: -r
 #readelf: -hA
 
 ELF Header:
-  Magic:   7f 45 4c 46 01 02 01 00 00 00 00 00 00 00 00 00.*
+  Magic:   .*
   Class:                             ELF32
-  Data:                              2's complement, big endian
+  Data:                              2's complement,.*
   Version:                           1 \(current\)
   OS/ABI:                            UNIX - System V
   ABI Version:                       0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
index 29d2eb9348..0f88cc2bfe 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-1.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-1.s -mips32r2
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
index 1e55b05638..73a6fd88f8 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-1.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-1.s -mips32r2
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
index f72eb0b760..68c9617b7d 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-1.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-1.s -mips32r2
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-ph.d
index 509834c135..0010520bbe 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -msingle-float -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -msingle-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
index 711eb1004a..c32f5b4820 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-2.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-2.s -mips32r2
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mfpxx
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
index 2c72a576e8..43fe4cb8f6 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-2.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-2.s -mips32r2
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
index e7aeb1a00d..9af8eac69c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-2.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-2.s -mips32r2
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-ph.d
index edeb6b1c76..6aa35d69f2 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -msoft-float -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -msoft-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
index 19fbce466d..131f44bb8b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-3.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-3.s -mips32r2
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
index de7393b0fe..276269666c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-3.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-3.s -mips32r2
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
index 0702cb53cb..06f37c5df2 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-3.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-3.s -mips32r2
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-4-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-4-ph.d
index 13f52674f1..3f0a1f6872 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-4-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-4-ph.d
@@ -1,15 +1,13 @@
-#source: attr-gnu-4-4.s -mips32r2 -32 -EB -W
-#ld: -melf32btsmip -e 0
+#source: attr-gnu-4-4.s -mips32r2 -W
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001200: \[abi=O32\] \[mips32r2\] \[old fp64\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
index d21e66f482..c8716e3b43 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-4.s -W -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-4.s -W -mips32r2
+#source: attr-gnu-4-5.s
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mfpxx\n
 #error:   [^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
index fb8baf840d..9fa1b01541 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-4.s -W -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-4.s -W -mips32r2
+#source: attr-gnu-4-6.s
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64\n
 #error:   [^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
index 889e0e1007..acb736b567 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-4.s -W -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-4.s -W -mips32r2
+#source: attr-gnu-4-7.s
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg\n
 #error:   [^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-5-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-5-ph.d
index b68bbf3d1c..1b5616c147 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-5-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-5-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -mfpxx -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -mfpxx
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
index ac848eddeb..651277dc8d 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
@@ -1,12 +1,12 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-0.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-0.s -mips32r2
+#ld: -r
 #readelf: -hA
 
 ELF Header:
-  Magic:   7f 45 4c 46 01 02 01 00 00 00 00 00 00 00 00 00.*
+  Magic:   .*
   Class:                             ELF32
-  Data:                              2's complement, big endian
+  Data:                              2's complement,.*
   Version:                           1 \(current\)
   OS/ABI:                            UNIX - System V
   ABI Version:                       0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
index 72ad87876b..81dc1a9115 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-1.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-1.s -mips32r2
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
index b36547d838..4ea6033560 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-2.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-2.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mfpxx \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
index 7312d17a19..4fbe58d5d6 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-3.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-3.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
index a5beaf1b6f..04155af87c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-4.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-4.s -W -mips32r2
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mfpxx \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-55.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-55.d
index d4569adbd2..af6d42d5fd 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-55.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-55.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-56.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-56.d
index d63150d1d7..d1b72094fb 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-56.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-56.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-57.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-57.d
index 5de1678c8c..73ba8d32e6 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-57.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-57.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
index 83d6747a9d..77470c832b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-5.s -32 -EB
-#source: attr-gnu-4-8.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-5.s
+#source: attr-gnu-4-8.s -W -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mfpxx \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-6-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-6-ph.d
index 9628991fdc..42545c86f5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-6-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-6-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -mfp64 -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -mfp64
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
index 62e6a2c883..80977a86df 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
@@ -1,12 +1,12 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-0.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-0.s -mips32r2
+#ld: -r
 #readelf: -hA
 
 ELF Header:
-  Magic:   7f 45 4c 46 01 02 01 00 03 00 00 00 00 00 00 00.*
+  Magic:   .*
   Class:                             ELF32
-  Data:                              2's complement, big endian
+  Data:                              2's complement,.*
   Version:                           1 \(current\)
   OS/ABI:                            UNIX - System V
   ABI Version:                       3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
index 6e9040cdf6..450551688b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-1.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-1.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
index 5eec884f2b..9aa789da4d 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-2.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-2.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
index eb750f3b0f..4f9f737a0e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-3.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-3.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
index a5dcb7ea9e..98a3b34bb5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-4.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-4.s -W -mips32r2
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-65.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-65.d
index ccf19b8634..ecf02d3b26 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-65.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-65.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-66.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-66.d
index 552e6d224c..cdccc0a504 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-66.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-66.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-67.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-67.d
index 171af5b215..8306b2ecf5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-67.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-67.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
index e850b0384e..f696dee1d9 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-6.s -32 -EB
-#source: attr-gnu-4-8.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-6.s
+#source: attr-gnu-4-8.s -W -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-7-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-7-ph.d
index b0245b61ae..ac4a0a89f7 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-7-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-7-ph.d
@@ -1,15 +1,13 @@
-#source: empty.s -mips32r2 -32 -mfp64 -mno-odd-spreg -EB
-#ld: -melf32btsmip -e 0
+#source: empty.s -mips32r2 -mfp64 -mno-odd-spreg
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-tradbigmips
+[^:]*:     file format elf32-.*
 
 Program Header:
-0x70000003 off    0x000000.. vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
+0x70000003 off    0x0000.... vaddr 0x004000.. paddr 0x004000.. align 2\*\*3
          filesz 0x00000018 memsz 0x00000018 flags r--
 #...
-    LOAD off    0x00000000 vaddr 0x00400000 paddr 0x00400000 align 2\*\*16
-         filesz 0x000000.. memsz 0x000000.. flags r--
 private flags = 70001000: \[abi=O32\] \[mips32r2\] \[not 32bitmode\]
 
 MIPS ABI Flags Version: 0
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
index 784401e9f7..3cd3250437 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
@@ -1,12 +1,12 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-0.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-0.s -mips32r2
+#ld: -r
 #readelf: -hA
 
 ELF Header:
-  Magic:   7f 45 4c 46 01 02 01 00 03 00 00 00 00 00 00 00.*
+  Magic:   .*
   Class:                             ELF32
-  Data:                              2's complement, big endian
+  Data:                              2's complement,.*
   Version:                           1 \(current\)
   OS/ABI:                            UNIX - System V
   ABI Version:                       3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
index b61b6c5e6e..d2d8b60d62 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-1.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-1.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
index 1d7dec5867..4ede98f714 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-2.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-2.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
index 41c0fdc620..cb87839812 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-3.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-3.s -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
index cc9279bf82..90eeaff1a9 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-4.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-4.s -W -mips32r2
+#ld: -r
 #error: \A[^\n]*: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-75.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-75.d
index 9b0e5878f0..831165805a 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-75.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-75.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-5.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-5.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-76.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-76.d
index d8f666b79a..47c7894b38 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-76.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-76.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-6.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-6.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-77.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-77.d
index 50d0236f0a..4c93528ca8 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-77.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-77.d
@@ -1,6 +1,6 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-7.s -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-7.s
+#ld: -r
 #readelf: -A
 
 Attribute Section: gnu
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
index b04ad225bd..1a9012d4f7 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
@@ -1,4 +1,4 @@
-#source: attr-gnu-4-7.s -32 -EB
-#source: attr-gnu-4-8.s -W -32 -EB
-#ld: -r -melf32btsmip
+#source: attr-gnu-4-7.s
+#source: attr-gnu-4-8.s -W -mips32r2
+#ld: -r
 #warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 64bb8e525f..27108d46ce 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -60,7 +60,7 @@ set linux_gnu [expr [istarget mips*-*-linux*]]
 set embedded_elf [expr [istarget mips*-*-elf]]
 
 # Set defaults.
-set abi_asflags(o32) ""
+set abi_asflags(o32) "-32"
 set abi_asflags(n32) "-march=from-abi -n32 -EB"
 set abi_asflags(n64) "-march=from-abi -64 -EB"
 set abi_ldflags(o32) ""
@@ -634,11 +634,24 @@ run_ld_link_tests $mips16_intermix_test
 
 run_dump_test "mips16-local-stubs-1"
 
+set o32flagslist [list [list as $abi_asflags(o32)] [list ld $abi_ldflags(o32)]]
+
 foreach firstfpabi [list 0 1 2 3 4 5 6 7 ] {
-  foreach secondfpabi [list 0 1 2 3 4 5 6 7 8] {
+  foreach secondfpabi [list 4 5 6 7 ] {
+    run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}" $o32flagslist
+  }
+}
+foreach firstfpabi [list 4 5 6 7 ] {
+  foreach secondfpabi [list 0 1 2 3 8] {
+    run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}" $o32flagslist
+  }
+}
+foreach firstfpabi [list 0 1 2 3 ] {
+  foreach secondfpabi [list 0 1 2 3 8] {
     run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}"
   }
 }
+
 run_dump_test "attr-gnu-4-81"
 
 run_dump_test "attr-gnu-8-00"
@@ -651,32 +664,35 @@ run_dump_test "attr-gnu-8-20"
 run_dump_test "attr-gnu-8-21"
 run_dump_test "attr-gnu-8-22"
 
-run_dump_test "attr-gnu-4-0-ph"
-run_dump_test "attr-gnu-4-1-ph"
-run_dump_test "attr-gnu-4-2-ph"
-run_dump_test "attr-gnu-4-3-ph"
-run_dump_test "attr-gnu-4-4-ph"
-run_dump_test "attr-gnu-4-5-ph"
-run_dump_test "attr-gnu-4-6-ph"
-run_dump_test "attr-gnu-4-7-ph"
-run_dump_test "attr-gnu-4-0-n32-ph"
-run_dump_test "attr-gnu-4-1-n32-ph"
-run_dump_test "attr-gnu-4-2-n32-ph"
-run_dump_test "attr-gnu-4-3-n32-ph"
-run_dump_test "attr-gnu-4-0-n64-ph"
-run_dump_test "attr-gnu-4-1-n64-ph"
-run_dump_test "attr-gnu-4-2-n64-ph"
-run_dump_test "attr-gnu-4-3-n64-ph"
+run_dump_test "attr-gnu-4-0-ph" $o32flagslist
+run_dump_test "attr-gnu-4-1-ph" $o32flagslist
+run_dump_test "attr-gnu-4-2-ph" $o32flagslist
+run_dump_test "attr-gnu-4-3-ph" $o32flagslist
+run_dump_test "attr-gnu-4-4-ph" $o32flagslist
+run_dump_test "attr-gnu-4-5-ph" $o32flagslist
+run_dump_test "attr-gnu-4-6-ph" $o32flagslist
+run_dump_test "attr-gnu-4-7-ph" $o32flagslist
 
-run_dump_test "abiflags-strip1-ph"
-run_dump_test "abiflags-strip2-ph"
-run_dump_test "abiflags-strip3-ph"
-run_dump_test "abiflags-strip4-ph"
-run_dump_test "abiflags-strip5-ph"
-run_dump_test "abiflags-strip6-ph"
-run_dump_test "abiflags-strip7-ph"
-run_dump_test "abiflags-strip8-ph"
-run_dump_test "abiflags-strip9-ph"
+if $has_newabi {
+  run_dump_test "attr-gnu-4-0-n32-ph"
+  run_dump_test "attr-gnu-4-1-n32-ph"
+  run_dump_test "attr-gnu-4-2-n32-ph"
+  run_dump_test "attr-gnu-4-3-n32-ph"
+  run_dump_test "attr-gnu-4-0-n64-ph"
+  run_dump_test "attr-gnu-4-1-n64-ph"
+  run_dump_test "attr-gnu-4-2-n64-ph"
+  run_dump_test "attr-gnu-4-3-n64-ph"
+}
+
+run_dump_test "abiflags-strip1-ph" $o32flagslist
+run_dump_test "abiflags-strip2-ph" $o32flagslist
+run_dump_test "abiflags-strip3-ph" $o32flagslist
+run_dump_test "abiflags-strip4-ph" $o32flagslist
+run_dump_test "abiflags-strip5-ph" $o32flagslist
+run_dump_test "abiflags-strip6-ph" $o32flagslist
+run_dump_test "abiflags-strip7-ph" $o32flagslist
+run_dump_test "abiflags-strip8-ph" $o32flagslist
+run_dump_test "abiflags-strip9-ph" $o32flagslist
 
 run_dump_test "nan-legacy"
 run_dump_test "nan-2008"