aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorRoland McGrath <mcgrathr@google.com>2013-10-29 16:15:38 -0700
committerRoland McGrath <mcgrathr@google.com>2013-10-29 16:15:38 -0700
commit70cc877f6e7fc1bb19d3a60b9e10fafd38b86b4a (patch)
treef6aeccdea5bb0544849d74fec65ba67c3eb7f2c3 /bfd
parent84f7b1503939cb9187c1b43828b5832092bdcb2e (diff)
downloadgdb-70cc877f6e7fc1bb19d3a60b9e10fafd38b86b4a.zip
gdb-70cc877f6e7fc1bb19d3a60b9e10fafd38b86b4a.tar.gz
gdb-70cc877f6e7fc1bb19d3a60b9e10fafd38b86b4a.tar.bz2
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.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf64-x86-64.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bc240ce..059998e 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-29 Jan Beulich <jbeulich@suse.com>
* elflink.c (struct elf_outext_info): Add field file_sym_done.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index a89485a..f748641 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 */