MIPS/LD/testsuite: Remove duplicate HI/LO relocation test dump files

There are only nonessential differences between corresponding o32 and n32 HI/LO relocation test dump files, so reduce the number of files by reusing the same dump between the two ABIs. Adjust test naming, also for the n64 ABI, for consistency with other tests.
2025-07-12 01:25:53 +01:00
parent 161554e152
commit 31b86e2ff9
20 changed files with 25 additions and 79 deletions
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-n32.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo-n32.d
@@ -1,8 +0,0 @@
-#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#as: -mmicromips -march=mips64r2
-#objdump: -d
-#ld: -Tmips-hilo.ld -e 0x500000 -N
-#notarget: mips*el-ps2-elf*
-#dump: micromips-hilo.d
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-n64.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo-n64.d
@@ -1,4 +1,4 @@
-#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs n64
+#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs (n64)
 #source: ../../../gas/testsuite/gas/mips/mips-hilo-n64.s
 #source: mips-hilo.s
 #as: -mmicromips -march=mips64r2
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n32.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n32.d
@@ -1,8 +0,0 @@
-#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs srec n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#as: -mmicromips -march=mips64r2
-#objdump: -m mips:micromips -j .sec1 -D
-#ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
-#notarget: mips*el-ps2-elf*
-#dump: micromips-hilo.d
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n64.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n64.d
@@ -1,4 +1,4 @@
-#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs srec n64
+#name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs srec (n64)
 #source: ../../../gas/testsuite/gas/mips/mips-hilo-n64.s
 #source: mips-hilo.s
 #as: -mmicromips -march=mips64r2
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-srec.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo-srec.d
@@ -1,7 +1,7 @@
 #name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs srec
 #source: ../../../gas/testsuite/gas/mips/mips-hilo.s
 #source: mips-hilo.s
-#as: -mmicromips -march=mips32r2
+#as: -mmicromips -march=mips64r2
 #objdump: -m mips:micromips -j .sec1 -D
 #ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
 #notarget: mips*el-ps2-elf*
--- a/ld/testsuite/ld-mips-elf/micromips-hilo.d
+++ b/ld/testsuite/ld-mips-elf/micromips-hilo.d
@@ -1,7 +1,7 @@
 #name: R_MICROMIPS_HI16 and R_MICROMIPS_LO16 relocs
 #source: ../../../gas/testsuite/gas/mips/mips-hilo.s
 #source: mips-hilo.s
-#as: -mmicromips -march=mips32r2
+#as: -mmicromips -march=mips64r2
 #objdump: -d
 #ld: -Tmips-hilo.ld -e 0x500000 -N
 #notarget: mips*el-ps2-elf*
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -815,38 +815,42 @@ run_dump_test_n32 "jalbal" noarch
 run_dump_test "mode-change-error-1"

 run_dump_test_o32 "mips16-hilo" noarch
-run_dump_test_n32 "mips16-hilo-n32" noarch
+run_dump_test_n32 "mips16-hilo" [list noarch [list name (n32)]]
 run_dump_test_o32 "mips16-hilo-srec" \
 	[list noarch \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
-run_dump_test_n32 "mips16-hilo-srec-n32" \
+run_dump_test_n32 "mips16-hilo-srec" \
 	[list noarch \
+	      [list name (n32)] \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
 run_dump_test_o32 "mips16e2-hilo" noarch
-run_dump_test_n32 "mips16e2-hilo-n32" noarch
+run_dump_test_n32 "mips16e2-hilo" [list noarch [list name (n32)]]
 run_dump_test_o32 "mips16e2-hilo-srec" \
 	[list noarch \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
-run_dump_test_n32 "mips16e2-hilo-srec-n32" \
+run_dump_test_n32 "mips16e2-hilo-srec" \
 	[list noarch \
+	      [list name (n32)] \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
 run_dump_test_o32 "mips-hilo"
-run_dump_test_n32 "mips-hilo-n32"
+run_dump_test_n32 "mips-hilo" [list [list name (n32)]]
 run_dump_test_n64 "mips-hilo-n64"
 run_dump_test_o32 "mips-hilo-srec" \
 	[list [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
-run_dump_test_n32 "mips-hilo-srec-n32" \
-	[list [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
+run_dump_test_n32 "mips-hilo-srec" \
+	[list [list name (n32)] \
+	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
 run_dump_test_n64 "mips-hilo-srec-n64" \
 	[list [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
 run_dump_test_o32 "micromips-hilo" noarch
-run_dump_test_n32 "micromips-hilo-n32" noarch
+run_dump_test_n32 "micromips-hilo" [list noarch [list name (n32)]]
 run_dump_test_n64 "micromips-hilo-n64" noarch
 run_dump_test_o32 "micromips-hilo-srec" \
 	[list noarch \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
-run_dump_test_n32 "micromips-hilo-srec-n32" \
+run_dump_test_n32 "micromips-hilo-srec" \
 	[list noarch \
+	      [list name (n32)] \
 	      [list objdump [expr { [istarget *el-*-*] ? "-EL" : "-EB" }]]]
 run_dump_test_n64 "micromips-hilo-srec-n64" \
 	[list noarch \
--- a/ld/testsuite/ld-mips-elf/mips-hilo-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips-hilo-n32.d
@@ -1,6 +0,0 @@
-#name: R_MIPS_HI16 and R_MIPS_LO16 relocs n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#objdump: -d
-#ld: -Tmips-hilo.ld -e 0x500000 -N
-#dump: mips-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips-hilo-n64.d
+++ b/ld/testsuite/ld-mips-elf/mips-hilo-n64.d
@@ -1,4 +1,4 @@
-#name: R_MIPS_HI16 and R_MIPS_LO16 relocs n64
+#name: R_MIPS_HI16 and R_MIPS_LO16 relocs (n64)
 #source: ../../../gas/testsuite/gas/mips/mips-hilo-n64.s
 #source: mips-hilo.s
 #objdump: -d
--- a/ld/testsuite/ld-mips-elf/mips-hilo-srec-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips-hilo-srec-n32.d
@@ -1,6 +0,0 @@
-#name: R_MIPS_HI16 and R_MIPS_LO16 relocs srec n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#objdump: -m mips:4000 -j .sec1 -D
-#ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
-#dump: mips-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips-hilo-srec-n64.d
+++ b/ld/testsuite/ld-mips-elf/mips-hilo-srec-n64.d
@@ -1,4 +1,4 @@
-#name: R_MIPS_HI16 and R_MIPS_LO16 relocs srec n64
+#name: R_MIPS_HI16 and R_MIPS_LO16 relocs srec (n64)
 #source: ../../../gas/testsuite/gas/mips/mips-hilo-n64.s
 #source: mips-hilo.s
 #objdump: -m mips:4000 -j .sec1 -D
--- a/ld/testsuite/ld-mips-elf/mips-hilo-srec.d
+++ b/ld/testsuite/ld-mips-elf/mips-hilo-srec.d
@@ -1,6 +1,6 @@
 #name: R_MIPS_HI16 and R_MIPS_LO16 relocs srec
 #source: ../../../gas/testsuite/gas/mips/mips-hilo.s
 #source: mips-hilo.s
-#objdump: -m mips:3000 -j .sec1 -D
+#objdump: -m mips:4000 -j .sec1 -D
 #ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
 #dump: mips-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
@@ -1,7 +0,0 @@
-#name: R_MIPS16_HI16 and R_MIPS16_LO16 relocs n32
-#source: ../../../gas/testsuite/gas/mips/mips16-hilo.s
-#source: mips-hilo.s
-#as: -march=mips3
-#objdump: -mmips:16 -dr
-#ld: -Tmips-hilo.ld -e 0x500000 -N
-#dump: mips16-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-srec-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo-srec-n32.d
@@ -1,7 +0,0 @@
-#name: R_MIPS16_HI16 and R_MIPS16_LO16 relocs srec n32
-#source: ../../../gas/testsuite/gas/mips/mips16-hilo.s
-#source: mips-hilo.s
-#as: -march=mips3
-#objdump: -mmips:16 -j .sec1 -D
-#ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
-#dump: mips16-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-srec.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo-srec.d
@@ -1,7 +1,7 @@
 #name: R_MIPS16_HI16 and R_MIPS16_LO16 relocs srec
 #source: ../../../gas/testsuite/gas/mips/mips16-hilo.s
 #source: mips-hilo.s
-#as: -march=mips1
+#as: -march=mips3
 #objdump: -mmips:16 -j .sec1 -D
 #ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
 #dump: mips16-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16-hilo.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo.d
@@ -1,8 +1,8 @@
 #name: R_MIPS16_HI16 and R_MIPS16_LO16 relocs
 #source: ../../../gas/testsuite/gas/mips/mips16-hilo.s
 #source: mips-hilo.s
-#as: -march=mips1
-#objdump: -mmips:16 -dr
+#as: -march=mips3
+#objdump: -mmips:16 -d
 #ld: -Tmips-hilo.ld -e 0x500000 -N

 .*:     file format (:?elf.*mips.*|srec)
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-hilo-n32.d
@@ -1,8 +0,0 @@
-#name: MIPS16e2 R_MIPS16_HI16 and R_MIPS16_LO16 relocs n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#as: -mips16 -mmips16e2 -march=mips64r2
-#objdump: -d
-#ld: -Tmips-hilo.ld -e 0x500000 -N
-#notarget: mips*el-ps2-elf*
-#dump: mips16e2-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec-n32.d
@@ -1,8 +0,0 @@
-#name: MIPS16e2 R_MIPS16_HI16 and R_MIPS16_LO16 relocs srec n32
-#source: ../../../gas/testsuite/gas/mips/mips-hilo.s
-#source: mips-hilo.s
-#as: -mips16 -mmips16e2 -march=mips64r2
-#objdump: -mmips:16 -j .sec1 -D
-#ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
-#notarget: mips*el-ps2-elf*
-#dump: mips16e2-hilo.d
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec.d
@@ -1,7 +1,7 @@
 #name: MIPS16e2 R_MIPS16_HI16 and R_MIPS16_LO16 relocs srec
 #source: ../../../gas/testsuite/gas/mips/mips-hilo.s
 #source: mips-hilo.s
-#as: -mips16 -mmips16e2 -march=mips32r2
+#as: -mips16 -mmips16e2 -march=mips64r2
 #objdump: -mmips:16 -j .sec1 -D
 #ld: --oformat=srec -Tmips-hilo.ld -e 0x500000 -N
 #notarget: mips*el-ps2-elf*
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-hilo.d
@@ -1,7 +1,7 @@
 #name: MIPS16e2 R_MIPS16_HI16 and R_MIPS16_LO16 relocs
 #source: ../../../gas/testsuite/gas/mips/mips-hilo.s
 #source: mips-hilo.s
-#as: -mips16 -mmips16e2 -march=mips32r2
+#as: -mips16 -mmips16e2 -march=mips64r2
 #objdump: -d
 #ld: -Tmips-hilo.ld -e 0x500000 -N
 #notarget: mips*el-ps2-elf*