x86: Merge X86_ISA_1_USED/X86_ISA_1_NEEDED properties

[deliverable/binutils-gdb.git] / ld / testsuite / ld-x86-64 / plt-nacl.pd

diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
index 2f5bab586ca1cda8aa34f79cc15c0c52828d4b00..9f572fdd1985594f969581a887b7948ca85f8c55 100644 (file)
--- a/ld/testsuite/ld-x86-64/plt-nacl.pd
+++ b/ld/testsuite/ld-x86-64/plt-nacl.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x40>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:   ff 35 ([0-9a-f]{2} ){4} *       pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
  +[0-9a-f]+:   4c 8b 1d ([0-9a-f]{2} ){4} *    mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
  +[0-9a-f]+:   41 83 e3 e0             and    \$0xffffffe0,%r11d
@@ -16,40 +16,40 @@ Disassembly of section .plt:
  +[0-9a-f]+:   41 ff e3                jmpq   \*%r11
  +[0-9a-f]+:   66 0f 1f 84 00 00 00    nopw   0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   00 00 *
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
  +[0-9a-f]+:   66 90                   xchg   %ax,%ax
 
 [0-9a-f]+ <fn1@plt>:
- +[0-9a-f]+:   4c 8b 1d ([0-9a-f]{2} ){4} *    mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x18>
+ +[0-9a-f]+:   4c 8b 1d ([0-9a-f]{2} ){4} *    mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <fn1>
  +[0-9a-f]+:   41 83 e3 e0             and    \$0xffffffe0,%r11d
  +[0-9a-f]+:   4d 01 fb                add    %r15,%r11
  +[0-9a-f]+:   41 ff e3                jmpq   \*%r11
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
  +[0-9a-f]+:   68 00 00 00 00          pushq  \$0x0
- +[0-9a-f]+:   e9 ([0-9a-f]{2} ){4} *  jmpq   [0-9a-f]+ <fn1@plt-0x40>
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   e9 ([0-9a-f]{2} ){4} *  jmpq   [0-9a-f]+ <.plt>
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
  +[0-9a-f]+:   0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 [0-9a-f]+ <fn2@plt>:
- +[0-9a-f]+:   4c 8b 1d ([0-9a-f]{2} ){4} *    mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x20>
+ +[0-9a-f]+:   4c 8b 1d ([0-9a-f]{2} ){4} *    mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <fn2>
  +[0-9a-f]+:   41 83 e3 e0             and    \$0xffffffe0,%r11d
  +[0-9a-f]+:   4d 01 fb                add    %r15,%r11
  +[0-9a-f]+:   41 ff e3                jmpq   \*%r11
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
  +[0-9a-f]+:   68 01 00 00 00          pushq  \$0x1
- +[0-9a-f]+:   e9 ([0-9a-f]{2} ){4} *  jmpq   [0-9a-f]+ <fn1@plt-0x40>
- +[0-9a-f]+:   66 66 66 66 66 66 2e    data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+ +[0-9a-f]+:   e9 ([0-9a-f]{2} ){4} *  jmpq   [0-9a-f]+ <.plt>
+ +[0-9a-f]+:   66 66 66 66 66 66 2e    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:   0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:   00 *
  +[0-9a-f]+:   0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)