x86_64-*-nacl*: Adjust test cases for PLT nop fix.

ld/testsuite/
	* ld-x86-64/plt-nacl.pd: Update expected disassembly for PLT nop fix.
	* ld-x86-64/tlsdesc-nacl.pd: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 94e859d..cacaeaa 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-01  Roland McGrath  <mcgrathr@google.com>
+
+       * ld-x86-64/plt-nacl.pd: Update expected disassembly for PLT nop fix.
+       * ld-x86-64/tlsdesc-nacl.pd: Likewise.
+
 2013-10-30  Alan Modra  <amodra@gmail.com>
 
        * ld-powerpc/elfv2.s,

diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
index 9a9363e..2f5bab5 100644 (file)
--- a/ld/testsuite/ld-x86-64/plt-nacl.pd
+++ b/ld/testsuite/ld-x86-64/plt-nacl.pd
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  +[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]+:   2e 0f 1f 84 00 00 00    nopl   %cs:0x0\(%rax,%rax,1\)
+ +[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]+:   0f 1f 84 00 00 00 00 *

diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
index e3903c4..61e6049 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
+++ b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
@@ -15,7 +15,7 @@ Disassembly of section .plt:
  +[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]+:   2e 0f 1f 84 00 00 00    nopl   %cs:0x0\(%rax,%rax,1\)
+ +[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]+:   0f 1f 84 00 00 00 00 *
@@ -31,7 +31,7 @@ Disassembly of section .plt:
  +[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]+:   2e 0f 1f 84 00 00 00    nopl   %cs:0x0\(%rax,%rax,1\)
+ +[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]+:   0f 1f 84 00 00 00 00 *