[PATCH 1/2] s390: Rename linker tests gotreloc_*-1 and weakundef-*

[Jens Remus]

This enables a subsequent patch to introduce a variation of those tests
with linker option --no-relax added.

ld/testsuite/
	* ld-s390/gotreloc_31-1.dd: Rename to ...
	* ld-s390/gotreloc_31-1a.dd: ... this.
	* ld-s390/gotreloc_31-no-pie-1.dd: Likewise.
	* ld-s390/gotreloc_31-no-pie-1a.dd: Likewise.
	* ld-s390/gotreloc_64-no-pie-1.dd: Likewise.
	* ld-s390/gotreloc_64-no-pie-1a.dd: Likewise.
	* ld-s390/gotreloc_64-norelro-1.dd: Likewise.
	* ld-s390/gotreloc_64-norelro-1a.dd Likewise.
	* ld-s390/weakundef-1.dd: Likewise.
	* ld-s390/weakundef-1a.dd: Likewise.
	* ld-s390/weakundef-2.dd: Likewise.
	* ld-s390/weakundef-2a.dd: Likewise.
	* ld-s390/s390.exp: Rename tests likewise.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
---
 .../{gotreloc_31-1.dd => gotreloc_31-1a.dd}   |  2 +-
 ...1-no-pie-1.dd => gotreloc_31-no-pie-1a.dd} |  2 +-
 ...4-no-pie-1.dd => gotreloc_64-no-pie-1a.dd} |  2 +-
 ...norelro-1.dd => gotreloc_64-norelro-1a.dd} |  2 +-
 ..._64-relro-1.dd => gotreloc_64-relro-1a.dd} |  2 +-
 ld/testsuite/ld-s390/s390.exp                 | 24 +++++++++----------
 .../{weakundef-1.dd => weakundef-1a.dd}       |  2 +-
 .../{weakundef-2.dd => weakundef-2a.dd}       |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)
 rename ld/testsuite/ld-s390/{gotreloc_31-1.dd => gotreloc_31-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{gotreloc_31-no-pie-1.dd => gotreloc_31-no-pie-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{gotreloc_64-no-pie-1.dd => gotreloc_64-no-pie-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{gotreloc_64-norelro-1.dd => gotreloc_64-norelro-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{gotreloc_64-relro-1.dd => gotreloc_64-relro-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{weakundef-1.dd => weakundef-1a.dd} (93%)
 rename ld/testsuite/ld-s390/{weakundef-2.dd => weakundef-2a.dd} (92%)

diff --git a/ld/testsuite/ld-s390/gotreloc_31-1.dd b/ld/testsuite/ld-s390/gotreloc_31-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/gotreloc_31-1.dd
rename to ld/testsuite/ld-s390/gotreloc_31-1a.dd
index d04e1e500915..52fb16a80dd2 100644
--- a/ld/testsuite/ld-s390/gotreloc_31-1.dd
+++ b/ld/testsuite/ld-s390/gotreloc_31-1a.dd
@@ -1,5 +1,5 @@
 
-tmpdir/gotreloc_31-1:     file format elf32-s390
+tmpdir/gotreloc_31-1a:     file format elf32-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/gotreloc_31-no-pie-1.dd b/ld/testsuite/ld-s390/gotreloc_31-no-pie-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/gotreloc_31-no-pie-1.dd
rename to ld/testsuite/ld-s390/gotreloc_31-no-pie-1a.dd
index dd2c474b755a..57bc3bc8f988 100644
--- a/ld/testsuite/ld-s390/gotreloc_31-no-pie-1.dd
+++ b/ld/testsuite/ld-s390/gotreloc_31-no-pie-1a.dd
@@ -1,5 +1,5 @@
 
-tmpdir/gotreloc_31-1:     file format elf32-s390
+tmpdir/gotreloc_31-1a:     file format elf32-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/gotreloc_64-no-pie-1.dd b/ld/testsuite/ld-s390/gotreloc_64-no-pie-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/gotreloc_64-no-pie-1.dd
rename to ld/testsuite/ld-s390/gotreloc_64-no-pie-1a.dd
index 57537aeecd88..cef446d42af9 100644
--- a/ld/testsuite/ld-s390/gotreloc_64-no-pie-1.dd
+++ b/ld/testsuite/ld-s390/gotreloc_64-no-pie-1a.dd
@@ -1,4 +1,4 @@
-tmpdir/gotreloc_64-1:     file format elf64-s390
+tmpdir/gotreloc_64-1a:     file format elf64-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/gotreloc_64-norelro-1.dd b/ld/testsuite/ld-s390/gotreloc_64-norelro-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/gotreloc_64-norelro-1.dd
rename to ld/testsuite/ld-s390/gotreloc_64-norelro-1a.dd
index eece724d217c..4e6387d594b1 100644
--- a/ld/testsuite/ld-s390/gotreloc_64-norelro-1.dd
+++ b/ld/testsuite/ld-s390/gotreloc_64-norelro-1a.dd
@@ -1,4 +1,4 @@
-tmpdir/gotreloc_64-1:     file format elf64-s390
+tmpdir/gotreloc_64-1a:     file format elf64-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/gotreloc_64-relro-1.dd b/ld/testsuite/ld-s390/gotreloc_64-relro-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/gotreloc_64-relro-1.dd
rename to ld/testsuite/ld-s390/gotreloc_64-relro-1a.dd
index 7cb11940f8e3..6273c3f1e876 100644
--- a/ld/testsuite/ld-s390/gotreloc_64-relro-1.dd
+++ b/ld/testsuite/ld-s390/gotreloc_64-relro-1a.dd
@@ -1,4 +1,4 @@
-tmpdir/gotreloc_64-1:     file format elf64-s390
+tmpdir/gotreloc_64-1a:     file format elf64-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/s390.exp b/ld/testsuite/ld-s390/s390.exp
index 27a1b346fe7c..8da0032eb803 100644
--- a/ld/testsuite/ld-s390/s390.exp
+++ b/ld/testsuite/ld-s390/s390.exp
@@ -52,13 +52,13 @@ set s390tests {
     {"GOT: symbol address load from got to larl"
      "-shared -melf_s390 --hash-style=sysv --version-script=gotreloc-1.ver --emit-relocs" ""
      "-m31" {gotreloc-1.s}
-     {{objdump -dzrj.text gotreloc_31-1.dd}}
-     "gotreloc_31-1"}
+     {{objdump -dzrj.text gotreloc_31-1a.dd}}
+     "gotreloc_31-1a"}
     {"GOT: no-pie symbol address load from got to larl"
      "-shared -melf_s390 --no-pie --hash-style=sysv --version-script=gotreloc-1.ver --emit-relocs" ""
      "-m31" {gotreloc-1.s}
-     {{objdump -dzrj.text gotreloc_31-no-pie-1.dd}}
-     "gotreloc_31-1"}
+     {{objdump -dzrj.text gotreloc_31-no-pie-1a.dd}}
+     "gotreloc_31-1a"}
     {"Helper shared library (PLT test)"
      "-shared -m elf_s390" "" "-m31" {pltlib.s}
      {}
@@ -90,18 +90,18 @@ set s390xtests {
     {"GOT: norelro symbol address load from got to larl"
      "-shared -melf64_s390 -z norelro --hash-style=sysv --version-script=gotreloc-1.ver --emit-relocs" ""
      "-m64" {gotreloc-1.s}
-     {{objdump -dzrj.text gotreloc_64-norelro-1.dd}}
-     "gotreloc_64-1"}
+     {{objdump -dzrj.text gotreloc_64-norelro-1a.dd}}
+     "gotreloc_64-1a"}
     {"GOT: relro symbol address load from got to larl"
      "-shared -melf64_s390 -z relro --hash-style=sysv --version-script=gotreloc-1.ver --emit-relocs" ""
      "-m64" {gotreloc-1.s}
-     {{objdump -dzrj.text gotreloc_64-relro-1.dd}}
-     "gotreloc_64-1"}
+     {{objdump -dzrj.text gotreloc_64-relro-1a.dd}}
+     "gotreloc_64-1a"}
     {"GOT: no-pie symbol address load from got to larl"
      "-shared -melf64_s390 --no-pie --hash-style=sysv --version-script=gotreloc-1.ver --emit-relocs" ""
      "-m64" {gotreloc-1.s}
-     {{objdump -dzrj.text gotreloc_64-no-pie-1.dd}}
-     "gotreloc_64-1"}
+     {{objdump -dzrj.text gotreloc_64-no-pie-1a.dd}}
+     "gotreloc_64-1a"}
     {"PLT: offset test"
      "-shared -m elf64_s390 -dT pltoffset-1.ld --no-error-rwx-segments" ""
      "-m64" {pltoffset-1.s}
@@ -109,10 +109,10 @@ set s390xtests {
      "pltoffset-1"}
     {"WEAKUNDEF1: overflow test (PC32DBL)"
      "-m elf64_s390 -dT 8GB.ld --emit-relocs --no-error-rwx-segments" "" "-m64" {weakundef-1.s}
-     {{objdump "-dzrj.text" weakundef-1.dd}} "weakundef-1"}
+     {{objdump "-dzrj.text" weakundef-1a.dd}} "weakundef-1a"}
     {"WEAKUNDEF2: overflow test (PLT32DBL)"
      "-m elf64_s390 -dT 8GB.ld --emit-relocs --no-error-rwx-segments -no-pie" "" "-m64" {weakundef-2.s}
-     {{objdump "-dzrj.text" weakundef-2.dd}} "weakundef-2"}
+     {{objdump "-dzrj.text" weakundef-2a.dd}} "weakundef-2a"}
     {"Helper shared library (PLT test)"
      "-shared -m elf64_s390" "" "-m64" {pltlib.s}
      {}
diff --git a/ld/testsuite/ld-s390/weakundef-1.dd b/ld/testsuite/ld-s390/weakundef-1a.dd
similarity index 93%
rename from ld/testsuite/ld-s390/weakundef-1.dd
rename to ld/testsuite/ld-s390/weakundef-1a.dd
index 3dd25c7d284e..49b68239aa78 100644
--- a/ld/testsuite/ld-s390/weakundef-1.dd
+++ b/ld/testsuite/ld-s390/weakundef-1a.dd
@@ -1,4 +1,4 @@
-tmpdir/weakundef-1:     file format elf64-s390
+tmpdir/weakundef-1a:     file format elf64-s390
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-s390/weakundef-2.dd b/ld/testsuite/ld-s390/weakundef-2a.dd
similarity index 92%
rename from ld/testsuite/ld-s390/weakundef-2.dd
rename to ld/testsuite/ld-s390/weakundef-2a.dd
index e586ff2e28c9..08e1824a5909 100644
--- a/ld/testsuite/ld-s390/weakundef-2.dd
+++ b/ld/testsuite/ld-s390/weakundef-2a.dd
@@ -1,4 +1,4 @@
-tmpdir/weakundef-2:     file format elf64-s390
+tmpdir/weakundef-2a:     file format elf64-s390
 
 Disassembly of section .text:
 
-- 
2.48.1