diff options
| author | Roland McGrath <mcgrathr@google.com> | 2013-10-30 15:57:58 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@google.com> | 2013-10-30 16:01:29 -0700 |
| commit | be157b60778bf79a915cd8e2df5bb0e8342ddbdd (patch) | |
| tree | c25f8c85a38dfb19c9fc8f69b80054e6354a3d57 | |
| parent | 9affe10b73d14eed9b31a5cfd0d6832d911c1fc9 (diff) | |
| download | ppe42-binutils-be157b60778bf79a915cd8e2df5bb0e8342ddbdd.tar.gz ppe42-binutils-be157b60778bf79a915cd8e2df5bb0e8342ddbdd.zip | |
gold: x86_64-nacl: Correct 9-byte nop sequence to match what the assembler generates.
gold/
* x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry):
Correct 9-byte nop sequence to match what the assembler generates.
(cherry picked from commit dd0845d708ab82f931fd7b800b4d218842ed635f)
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/x86_64.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 517b7ba84f..df049fb109 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2013-10-30 Roland McGrath <mcgrathr@google.com> + + * x86_64.cc (Output_data_plt_x86_64_nacl::first_plt_entry): + Correct 9-byte nop sequence to match what the assembler generates. + 2013-10-14 Alan Modra <amodra@gmail.com> * output.h (Output_data_got::add_constant): Tidy. diff --git a/gold/x86_64.cc b/gold/x86_64.cc index b95d2ed8f2..b9f9f17acc 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -4649,7 +4649,7 @@ Output_data_plt_x86_64_nacl<size>::first_plt_entry[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 |
