[COMMITTED PATCH] x86_64-*-nacl*: Adjust test cases for PLT nop fix.

Roland McGrath mcgrathr@google.com
Fri Nov 1 22:17:00 GMT 2013


When I fixed the x86_64-nacl PLT generation on Tuesday to use the right nop
instruction, I forgot to adjust the test cases to match.

Committed to trunk and 2.24 branch.

Thanks,
Roland


ld/testsuite/
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.

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



More information about the Binutils mailing list