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 (file)
index 1cb3d87..0000000
--- 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 1243e91a73cab9156984d7c300681955c4b24271..b3d34a180d8f4855cd369b51c154ec7ed49fc887 100644 (file)
--- 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 (file)
index 1ea7daa..0000000
--- 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 c25fbe803d45263709ffe0fbd19ec3433ff49c16..efbaaa55d94ef29f9dede62febbe72e6f0c9d813 100644 (file)
--- 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 e6b84592c8363f8c34fb0e0c113f299c8cff9cb2..c8bee0a0e1019dca0db870414a85c234ecc365da 100644 (file)
--- 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 d518dfb9560af50c5c9ce90c812d90eca04ac700..ec5c9d1b7ff057302400d0f23f38665ba616e680 100644 (file)
--- 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 d0919ea665fad5d06241fb09d5a7d74284a6e84b..e95f1e739cdc905b05b4b90c7c18ba4f43faeca5 100644 (file)
--- 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 (file)
index 012e1f0..0000000
--- 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 5a3f9198f645f6d6d7044389d61c685584a53375..9cac1b38856b656aab6d67196f0670f7a9cda8f3 100644 (file)
--- 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 (file)
index ccd0195..0000000
--- 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 b02983e2f30d19be8df5adf8edde25b3e69bd8b7..19ba44ce68ea30b2f8e30c84772d0ea53a38b3b6 100644 (file)
--- 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 59e5717a9a8aae3ace5cb01e32b819a28f3a1d93..a6afb3f9bdff6330f41cc316754f83dc0e8cb96a 100644 (file)
--- 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 (file)
index 08b591c..0000000
--- 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 (file)
index 724adcb..0000000
--- 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 9c41d9a3ae910e19a810825665f3b0732361d12c..cd20d9802e180d06a355088881cdf0315f173d1e 100644 (file)
--- 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 1f01ca23491a7c99626034a77249204980334007..3a8dc71aeea3e4ed097568201c53fae24b341e27 100644 (file)
--- 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 (file)
index e900e87..0000000
--- 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 (file)
index 0132fa8..0000000
--- 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 e46708bc432e956068e76d1d4a0d275d85ea2dea..12a2d28604bd27ece6ebaa200d60fc9e66869e3a 100644 (file)
--- 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 eb93873bf6bb08e1aab84de3257ddd15be872844..5aa16248e8cabd423446d0b707512513b72dc0cf 100644 (file)
--- 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*