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.

(cherry picked from commit 61674ef7c5fed87cf71e65eab274199634208298)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f4ee7e85e8a457284a39ff426fbaf4048811f233..0f4a60d1e3f597539ee54e5eb3293f3bb3b18a48 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-05  Gregory Fong  <gregory.0xf0@gmail.com>
 
        * ld-mips-elf/eh-frame5.d, ld-mips-elf/jalx-2.dd,

diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
index 9a9363eec43865e6e47d243329fe46d18cc6d8a7..2f5bab586ca1cda8aa34f79cc15c0c52828d4b00 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 e3903c490b8515477837cf1087998639934617fe..61e60496c87792ccd3de796f3005e705f9820eb7 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 *