From 69d2461893db398092f5ace845e339bd5a0cfefc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 18 Jan 2020 14:42:24 -0800 Subject: [PATCH] Fix ld-x86-64/align-branch-1 test failure on --target=x86_64-elf ld/ChangeLog * testsuite/ld-x86-64/align-branch-1.d: Loosen instruction regexps to admit whatever absolute address. The label-relative address is what the test needs to verify. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-x86-64/align-branch-1.d | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6ac222eb3b8..c5f873407d7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2020-01-18 Roland McGrath + + * testsuite/ld-x86-64/align-branch-1.d: Loosen instruction regexps + to admit whatever absolute address. The label-relative address is + what the test needs to verify. + 2020-01-18 Nick Clifton * configure: Regenerate. diff --git a/ld/testsuite/ld-x86-64/align-branch-1.d b/ld/testsuite/ld-x86-64/align-branch-1.d index 85679123d77..19a6a4d4a46 100644 --- a/ld/testsuite/ld-x86-64/align-branch-1.d +++ b/ld/testsuite/ld-x86-64/align-branch-1.d @@ -10,12 +10,12 @@ Disassembly of section .text: [a-f0-9]+ <_start>: +[a-f0-9]+: 85 d2 test %edx,%edx - +[a-f0-9]+: 74 21 je 401025 <_start\+0x25> + +[a-f0-9]+: 74 21 je [a-f0-9]+ <_start\+0x25> +[a-f0-9]+: 48 85 ff test %rdi,%rdi - +[a-f0-9]+: 74 1c je 401025 <_start\+0x25> + +[a-f0-9]+: 74 1c je [a-f0-9]+ <_start\+0x25> +[a-f0-9]+: 66 66 66 64 48 8b 04 25 00 00 00 00 data16 data16 data16 mov %fs:0x0,%rax +[a-f0-9]+: 2e 2e 2e 2e 48 8b 98 fc ff ff ff cs cs cs mov %cs:-0x4\(%rax\),%rbx +[a-f0-9]+: 48 85 db test %rbx,%rbx - +[a-f0-9]+: 74 00 je 401025 <_start\+0x25> + +[a-f0-9]+: 74 00 je [a-f0-9]+ <_start\+0x25> +[a-f0-9]+: c3 retq #pass -- 2.30.2