diff options
| author | Roland McGrath <mcgrathr@google.com> | 2013-11-01 14:54:40 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@google.com> | 2013-11-01 15:15:51 -0700 |
| commit | 9fbf92609dc7099be096e4532ac7c1aa7836a386 (patch) | |
| tree | 149f6c8adbc58ba464e172cf57c3946fc89a8148 | |
| parent | bc235b9f0311d995ad172231e678a9d583b7ed19 (diff) | |
| download | ppe42-binutils-9fbf92609dc7099be096e4532ac7c1aa7836a386.tar.gz ppe42-binutils-9fbf92609dc7099be096e4532ac7c1aa7836a386.zip | |
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)
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/plt-nacl.pd | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/tlsdesc-nacl.pd | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index f4ee7e85e8..0f4a60d1e3 100644 --- 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 9a9363eec4..2f5bab586c 100644 --- 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 e3903c490b..61e60496c8 100644 --- 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 * |
