diff options
| author | Roland McGrath <mcgrathr@google.com> | 2013-10-29 16:15:38 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@google.com> | 2013-10-29 16:18:01 -0700 |
| commit | 9affe10b73d14eed9b31a5cfd0d6832d911c1fc9 (patch) | |
| tree | c9c2a8af789e56d8f160150b0bce82d0342524bf | |
| parent | 7b8b277e6c2952971a9b6b3bc353e976d4089fc4 (diff) | |
| download | ppe42-binutils-9affe10b73d14eed9b31a5cfd0d6832d911c1fc9.tar.gz ppe42-binutils-9affe10b73d14eed9b31a5cfd0d6832d911c1fc9.zip | |
BFD: elf64-x86-64-nacl: Correct 9-byte nop sequence used in PLT0 entry.
bfd/
* elf64-x86-64.c (elf_x86_64_nacl_plt0_entry): Correct 9-byte nop
sequence to match what the assembler generates.
(cherry picked from commit 70cc877f6e7fc1bb19d3a60b9e10fafd38b86b4a)
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4036807a2e..34ecf12c3f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-10-29 Roland McGrath <mcgrathr@google.com> + + * elf64-x86-64.c (elf_x86_64_nacl_plt0_entry): Correct 9-byte nop + sequence to match what the assembler generates. + 2013-10-17 Alan Modra <amodra@gmail.com> PR 16056 diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index a89485a157..f748641ea8 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -5383,7 +5383,7 @@ static const bfd_byte elf_x86_64_nacl_plt0_entry[NACL_PLT_ENTRY_SIZE] = 0x41, 0xff, 0xe3, /* jmpq *%r11 */ /* 9-byte nop sequence to pad out to the next 32-byte boundary. */ - 0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopl %cs:0x0(%rax,%rax,1) */ + 0x66, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw 0x0(%rax,%rax,1) */ /* 32 bytes of nop to pad out to the standard size. */ 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, /* excess data32 prefixes */ |
