x86-64: Remove pr19609-4c.d and pr19609-4d.d

Remove pr19609-4c.d and pr19609-4d.d since they are identical to
pr19609-4a.d and pr19609-4b.d, respectively.

	* testsuite/ld-x86-64/pr19609-4c.d: Removed.
	* testsuite/ld-x86-64/pr19609-4d.d: Likewise.
	* testsuite/ld-x86-64/pr19609-4e.d: Renamed to ...
	* testsuite/ld-x86-64/pr19609-4c.d: This.
	* testsuite/ld-x86-64/x86-64.exp: Updated.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>

diff --git a/ld/testsuite/ld-x86-64/pr19609-4c.d b/ld/testsuite/ld-x86-64/pr19609-4c.d
index eb37d0c8729b56489da2fa165f7811582870a7f2..39be216c23b3e0c470c1dbdcb4d1b3b11846c150 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-4c.d
+++ b/ld/testsuite/ld-x86-64/pr19609-4c.d
@@ -1,4 +1,13 @@
 #source: pr19609-4.s
 #as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000
-#error: .*failed to convert GOTPCREL relocation against 'foo'; relink with --no-relax.*failed to convert GOTPCREL relocation against 'foo'; relink with --no-relax.*
+#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
+#objdump: -dw
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+70000000 <_start>:
+[      ]*[a-f0-9]+:    48 8b 05 ([0-9a-f]{2} ){4} *    mov    [-]?0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_start\+0x1000>
+[      ]*[a-f0-9]+:    4c 8b 1d ([0-9a-f]{2} ){4} *    mov    [-]?0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_start\+0x1000>

diff --git a/ld/testsuite/ld-x86-64/pr19609-4d.d b/ld/testsuite/ld-x86-64/pr19609-4d.d
deleted file mode 100644 (file)
index cb92aa6..0000000
--- a/ld/testsuite/ld-x86-64/pr19609-4d.d
+++ /dev/null
@@ -1,13 +0,0 @@
-#source: pr19609-4.s
-#as: --x32 -mrelax-relocations=yes
-#ld: -melf32_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000
-#objdump: -dw
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-70000000 <_start>:
-[      ]*[a-f0-9]+:    40 c7 c0 00 00 00 a0    rex mov \$0xa0000000,%eax
-[      ]*[a-f0-9]+:    41 c7 c3 00 00 00 a0    mov    \$0xa0000000,%r11d

diff --git a/ld/testsuite/ld-x86-64/pr19609-4e.d b/ld/testsuite/ld-x86-64/pr19609-4e.d
deleted file mode 100644 (file)
index 39be216..0000000
--- a/ld/testsuite/ld-x86-64/pr19609-4e.d
+++ /dev/null
@@ -1,13 +0,0 @@
-#source: pr19609-4.s
-#as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
-#objdump: -dw
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+70000000 <_start>:
-[      ]*[a-f0-9]+:    48 8b 05 ([0-9a-f]{2} ){4} *    mov    [-]?0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_start\+0x1000>
-[      ]*[a-f0-9]+:    4c 8b 1d ([0-9a-f]{2} ){4} *    mov    [-]?0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_start\+0x1000>

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 48a468814c135287c6a37b21e0a9f479d6362d83..bde29fbd571d3c495376af96a7ed08527ccead52 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -729,8 +729,6 @@ run_dump_test "pr19609-3b"
 run_dump_test "pr19609-4a"
 run_dump_test "pr19609-4b"
 run_dump_test "pr19609-4c"
-run_dump_test "pr19609-4d"
-run_dump_test "pr19609-4e"
 run_dump_test "pr19609-5a"
 run_dump_test "pr19609-5b"
 run_dump_test "pr19609-5c"