[COMMITTED PATCH] fix x86_64-nacl ld testsuite

Roland McGrath mcgrathr@google.com
Tue Apr 24 18:30:00 GMT 2012


When I fixed the nop padding in the x86_64-nacl PLT generation,
I forgot to update the corresponding test cases.  This restores
'make -C ld check' to full success on --target=x86_64-nacl.

Committed as obvious.


Thanks,
Roland

ld/testsuite/
2012-04-24  Roland McGrath  <mcgrathr@google.com>

	* ld-x86-64/plt-nacl.pd: Fix expected nop padding.
	* ld-x86-64/tlsdesc-nacl.pd: Likewise.

diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
index 9a6c6b3..9a9363e 100644
--- a/ld/testsuite/ld-x86-64/plt-nacl.pd
+++ b/ld/testsuite/ld-x86-64/plt-nacl.pd
@@ -14,14 +14,15 @@ 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]+:	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 *
  +[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]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 2e 0f 1f 84 00 	data32 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 00 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>
diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
index 066d760..e3903c4 100644
--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
+++ b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
@@ -15,14 +15,15 @@ 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]+:	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 *
  +[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]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 2e 0f 1f 84 00 	data32 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 00 00 *
+ +[0-9a-f]+:	66 90                	xchg   %ax,%ax
 
 [0-9a-f]+ <.*@plt>:
  +[0-9a-f]+:	ff 35 .. .. .. ..    	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
@@ -30,11 +31,12 @@ 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]+:	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 *
  +[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]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 2e 0f 1f 84 00 	data32 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 00 00 *
+ +[0-9a-f]+:	66 90                	xchg   %ax,%ax



More information about the Binutils mailing list