ld/testsuite/

	* ld-mips-elf/attr-gnu-4-00.d: Remove assembler options and emulator
	linker option.
	* ld-mips-elf/attr-gnu-4-01.d, ld-mips-elf/attr-gnu-4-02.d,
	ld-mips-elf/attr-gnu-4-03.d, ld-mips-elf/attr-gnu-4-04.d,
	ld-mips-elf/attr-gnu-4-05.d, ld-mips-elf/attr-gnu-4-10.d,
	ld-mips-elf/attr-gnu-4-11.d, ld-mips-elf/attr-gnu-4-12.d,
	ld-mips-elf/attr-gnu-4-13.d, ld-mips-elf/attr-gnu-4-14.d,
	ld-mips-elf/attr-gnu-4-15.d, ld-mips-elf/attr-gnu-4-20.d,
	ld-mips-elf/attr-gnu-4-21.d, ld-mips-elf/attr-gnu-4-22.d,
	ld-mips-elf/attr-gnu-4-23.d, ld-mips-elf/attr-gnu-4-24.d,
	ld-mips-elf/attr-gnu-4-25.d, ld-mips-elf/attr-gnu-4-30.d,
	ld-mips-elf/attr-gnu-4-31.d, ld-mips-elf/attr-gnu-4-32.d,
	ld-mips-elf/attr-gnu-4-33.d, ld-mips-elf/attr-gnu-4-34.d,
	ld-mips-elf/attr-gnu-4-35.d, ld-mips-elf/attr-gnu-4-40.d,
	ld-mips-elf/attr-gnu-4-41.d, ld-mips-elf/attr-gnu-4-42.d,
	ld-mips-elf/attr-gnu-4-43.d, ld-mips-elf/attr-gnu-4-44.d,
	ld-mips-elf/attr-gnu-4-45.d, ld-mips-elf/attr-gnu-4-51.d: Likewise.

32 files changed, 51 insertions, 62 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d12501e..24b0c3c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,25 @@
 2012-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* ld-mips-elf/attr-gnu-4-00.d: Remove assembler options and emulator
+	linker option.
+	* ld-mips-elf/attr-gnu-4-01.d, ld-mips-elf/attr-gnu-4-02.d,
+	ld-mips-elf/attr-gnu-4-03.d, ld-mips-elf/attr-gnu-4-04.d,
+	ld-mips-elf/attr-gnu-4-05.d, ld-mips-elf/attr-gnu-4-10.d,
+	ld-mips-elf/attr-gnu-4-11.d, ld-mips-elf/attr-gnu-4-12.d,
+	ld-mips-elf/attr-gnu-4-13.d, ld-mips-elf/attr-gnu-4-14.d,
+	ld-mips-elf/attr-gnu-4-15.d, ld-mips-elf/attr-gnu-4-20.d,
+	ld-mips-elf/attr-gnu-4-21.d, ld-mips-elf/attr-gnu-4-22.d,
+	ld-mips-elf/attr-gnu-4-23.d, ld-mips-elf/attr-gnu-4-24.d,
+	ld-mips-elf/attr-gnu-4-25.d, ld-mips-elf/attr-gnu-4-30.d,
+	ld-mips-elf/attr-gnu-4-31.d, ld-mips-elf/attr-gnu-4-32.d,
+	ld-mips-elf/attr-gnu-4-33.d, ld-mips-elf/attr-gnu-4-34.d,
+	ld-mips-elf/attr-gnu-4-35.d, ld-mips-elf/attr-gnu-4-40.d,
+	ld-mips-elf/attr-gnu-4-41.d, ld-mips-elf/attr-gnu-4-42.d,
+	ld-mips-elf/attr-gnu-4-43.d, ld-mips-elf/attr-gnu-4-44.d,
+	ld-mips-elf/attr-gnu-4-45.d, ld-mips-elf/attr-gnu-4-51.d: Likewise.
+
+2012-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* ld-mips-elf/eh-frame1.ld (.gcc_compiled_long32): Add KEEP.
 	* ld-mips-elf/eh-frame3.d: Move definition of foo to the link line
 	and change to a 32-bit value.  Expect CIEs to be marged.
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
index cd95356..32bc319 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-0.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
index 88bd9c2..7a5c7a1 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
index a9cd487..f29d5d5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-2.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
index 64f03f5..e571e13 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-3.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
index 62b9eef..f8dee5c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-4.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
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 ebfc6d8..6856df0 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-0.s
 #source: attr-gnu-4-5.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
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 cd15000..7661963 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-0.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
index 37ccda1..f70306b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
index 3ee6025..447621c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-2.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -msingle-float, .* uses -mdouble-float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
index a48c119..417798e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-3.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
index e899382..b940889 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-4.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64
 #target: mips*-*-*
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 e3ac7fc..337b8a4 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-5.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses unknown floating point ABI 5
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
index 23fc72d..3620069 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-0.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
index 3f84867..08436e7 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -msingle-float, .* uses -mdouble-float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
index 062bfaf..63edea9 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-2.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
index c0c14fd..d9f76d3 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-3.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
index 09e8175..213996c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-4.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -mips32r2 -mfp64
 #target: mips*-*-*
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 0f27255..5b26875 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-5.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses unknown floating point ABI 5
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
index d123328..cdc108e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-0.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
index 6a629e7..cac5812 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
index 824d467..dd066dd 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-2.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
index 28d9d31..39eebb3 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-3.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
index 2a9b0f3..33a987a 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-4.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
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 c3ad25f..763e12e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-5.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #warning: Warning: .* uses unknown floating point ABI 5
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
index d28aa2a..27d4571 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-0.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
index 71f74a9..a00e626 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
index c095695..f67f1c8 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-2.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses -mips32r2 -mfp64
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
index 8396e38..e3d8b20 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
@@ -1,6 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-3.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses hard float, .* uses soft float
 #target: mips*-*-*
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
index 8be31de..68b03a0 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-4.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #readelf: -A
 #target: mips*-*-*
 
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 11738c5..0bf4d71 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
@@ -1,7 +1,6 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-5.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses unknown floating point ABI 5
 #target: mips*-*-*
 
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 b5f1c22..5c62640 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,5 @@
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-1.s
-#as: -EB -32
-#ld: -r -melf32btsmip
+#ld: -r
 #warning: Warning: .* uses unknown floating point ABI 5
 #target: mips*-*-*