From: Maciej W. Rozycki <macro@orcam.me.uk>
Date: Sat, 12 Jul 2025 00:25:53 +0000 (+0100)
Subject: MIPS/LD/testsuite: Remove duplicate HI/LO relocation test dump files
X-Git-Tag: binutils-2_45~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31b86e2ff93fb0de25ea1107625de415b8c7b649;p=thirdparty%2Fbinutils-gdb.git

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.
---

diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo-n32.d b/ld/testsuite/ld-mips-elf/micromips-hilo-n32.d
deleted file mode 100644
index 1cb3d87b5ef..00000000000
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo-n64.d b/ld/testsuite/ld-mips-elf/micromips-hilo-n64.d
index 1243e91a73c..b3d34a180d8 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n32.d b/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n32.d
deleted file mode 100644
index 1ea7daa3036..00000000000
--- a/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n64.d b/ld/testsuite/ld-mips-elf/micromips-hilo-srec-n64.d
index c25fbe803d4..efbaaa55d94 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo-srec.d b/ld/testsuite/ld-mips-elf/micromips-hilo-srec.d
index e6b84592c83..c8bee0a0e10 100644
--- 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*
diff --git a/ld/testsuite/ld-mips-elf/micromips-hilo.d b/ld/testsuite/ld-mips-elf/micromips-hilo.d
index d518dfb9560..ec5c9d1b7ff 100644
--- 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*
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index d0919ea665f..e95f1e739cd 100644
--- 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 \
diff --git a/ld/testsuite/ld-mips-elf/mips-hilo-n32.d b/ld/testsuite/ld-mips-elf/mips-hilo-n32.d
deleted file mode 100644
index 012e1f0a791..00000000000
--- a/ld/testsuite/ld-mips-elf/mips-hilo-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips-hilo-n64.d b/ld/testsuite/ld-mips-elf/mips-hilo-n64.d
index 5a3f9198f64..9cac1b38856 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/mips-hilo-srec-n32.d b/ld/testsuite/ld-mips-elf/mips-hilo-srec-n32.d
deleted file mode 100644
index ccd0195bdda..00000000000
--- a/ld/testsuite/ld-mips-elf/mips-hilo-srec-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips-hilo-srec-n64.d b/ld/testsuite/ld-mips-elf/mips-hilo-srec-n64.d
index b02983e2f30..19ba44ce68e 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/mips-hilo-srec.d b/ld/testsuite/ld-mips-elf/mips-hilo-srec.d
index 59e5717a9a8..a6afb3f9bdf 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d b/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
deleted file mode 100644
index 08b591caea1..00000000000
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo-srec-n32.d b/ld/testsuite/ld-mips-elf/mips16-hilo-srec-n32.d
deleted file mode 100644
index 724adcbae99..00000000000
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-srec-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo-srec.d b/ld/testsuite/ld-mips-elf/mips16-hilo-srec.d
index 9c41d9a3ae9..cd20d9802e1 100644
--- 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
diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo.d b/ld/testsuite/ld-mips-elf/mips16-hilo.d
index 1f01ca23491..3a8dc71aeea 100644
--- 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)
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-hilo-n32.d b/ld/testsuite/ld-mips-elf/mips16e2-hilo-n32.d
deleted file mode 100644
index e900e870e28..00000000000
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec-n32.d b/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec-n32.d
deleted file mode 100644
index 0132fa82e17..00000000000
--- a/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec-n32.d
+++ /dev/null
@@ -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
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec.d b/ld/testsuite/ld-mips-elf/mips16e2-hilo-srec.d
index e46708bc432..12a2d28604b 100644
--- 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*
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-hilo.d b/ld/testsuite/ld-mips-elf/mips16e2-hilo.d
index eb93873bf6b..5aa16248e8c 100644
--- 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*