MIPS/LD/testsuite: Fix JALR relaxation test failure with IRIX 6

The `mips-sgi-irix6' target only supports IRIX linker emulations, but
most JALR relaxation tests request the relevant traditional emulation
instead, causing a link failure:

./ld-new: unrecognised emulation mode: elf32btsmipn32
Supported emulations: elf32bmipn32 elf32bsmip elf64bmip

This is clearly an omission from the conversion to use the per-ABI
framework made with commit 78da84f99405 ("MIPS/LD/testsuite: Correct
mips-elf.exp test ABI/emul/endian arrangement").  These tests are also
endianness agnostic, which was missed in the conversion as well.

Remove the unnecessary explicit ABI and endianness options then and rely
on the per-ABI framework to get things right, removing this regression:

mips-sgi-irix6  -FAIL: MIPS relax-jalr-shared n32

	ld/
	* testsuite/ld-mips-elf/relax-jalr-n32-shared.d: Remove flags
	related to ABI and endianness selection from the `as' and `ld'
	tags.
	* testsuite/ld-mips-elf/relax-jalr-n64.d: Likewise.
	* testsuite/ld-mips-elf/relax-jalr-n64-shared.d: Likewise.
	* testsuite/ld-mips-elf/mips-elf.exp: Remove `as' and `ld' tag
	additions from the invocation of JALR relaxation tests.

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 903f7a0a3832ef850e57b3ab5d0b5c7f20a541b3..46cdcc91e5469c237d772b4de56000bdf771329a 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -499,10 +499,10 @@ if { $irix } {
     run_dump_test_n64 "elf-rel-xgot-n64" {{as -EB} {ld -EB}}
 }
 
-run_dump_test_n32 "relax-jalr-n32" {{as -EB} {ld -EB}}
-run_dump_test_n32 "relax-jalr-n32-shared" {{as -EB} {ld -EB}}
-run_dump_test_n64 "relax-jalr-n64" {{as -EB} {ld -EB}}
-run_dump_test_n64 "relax-jalr-n64-shared" {{as -EB} {ld -EB}}
+run_dump_test_n32 "relax-jalr-n32"
+run_dump_test_n32 "relax-jalr-n32-shared"
+run_dump_test_n64 "relax-jalr-n64"
+run_dump_test_n64 "relax-jalr-n64-shared"
 
 if { $linux_gnu } {
     run_dump_test_o32 "rel32-o32" {{as -EB} {ld -EB}}

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
index 597c8091c868aa0738b043ee917c23ef36a29f3f..7e382d8be4651629dddbf89dd59f35e09ad5dde0 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
@@ -1,8 +1,8 @@
 #name: MIPS relax-jalr-shared n32
 #source: relax-jalr.s
-#as: -march=from-abi -KPIC -n32 -EB
+#as: -KPIC
 #objdump: --prefix-addresses -d --show-raw-insn
-#ld: -shared -melf32btsmipn32
+#ld: -shared
 #target: [check_shared_lib_support]
 
 .*:     file format elf.*mips.*

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
index e46fba2b85c016dc4274cd3ea9e906faa7370c4b..bfcd6f900443bc52d8ccd2b233a4601a71af31b9 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
@@ -1,8 +1,8 @@
 #name: MIPS relax-jalr-shared n64
 #source: relax-jalr.s
-#as: -march=from-abi -KPIC -64 -EB
+#as: -KPIC
 #objdump: --prefix-addresses -d --show-raw-insn
-#ld: -shared -melf64btsmip
+#ld: -shared
 #target: [check_shared_lib_support]
 
 .*:     file format elf.*mips.*

diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
index e3518ba0121bab24cacaeb3647d70b190ad127b1..71e0f3576fd15209d48ea83a8a3783fbd10b4e72 100644 (file)
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
@@ -1,8 +1,7 @@
 #name: MIPS relax-jalr n64
 #source: relax-jalr.s
-#as: -march=from-abi -KPIC -64 -EB
+#as: -KPIC
 #objdump: --prefix-addresses -d --show-raw-insn
-#ld: -melf64btsmip
 
 .*:     file format elf.*mips.*