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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bc240cefef208133edc3cf064b4b0123f6a43d1b..059998e1521e607e0715e8aa1fb79605b7dc88b4 100644 (file)
--- 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 a89485a157fe7e57b5fbf73b5bebff6a417fe43b..f748641ea8d5fae8f2ba3b7d3cdae128397ba7ab 100644 (file)
--- 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   */