[COMMITTED] Fix ld-x86-64/align-branch-1 test failure on --target=x86_64-elf

Message ID CAB=4xho1gMYL0=H2i7C4APVLQzmUr0WLwuY19rKm0C-yU5H1BA@mail.gmail.com
State New
Headers show
Series
  • [COMMITTED] Fix ld-x86-64/align-branch-1 test failure on --target=x86_64-elf
Related show

Commit Message

H.J. Lu via Binutils Jan. 18, 2020, 11:05 p.m.
Committed as obvious enough on trunk and 2.34 branch.  This restores
successful `make check-ld` for `--target=x86_64-elf`.

Thanks,
Roland


ld/
2020-01-18  Roland McGrath  <mcgrathr@google.com>

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

Patch

diff --git a/ld/testsuite/ld-x86-64/align-branch-1.d b/ld/testsuite/ld-x86-64/a$
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 mo$
  +[a-f0-9]+:   2e 2e 2e 2e 48 8b 98 fc ff ff ff        cs cs cs mov %cs:-0x4\($
  +[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