aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorRoland McGrath <mcgrathr@google.com>2013-10-30 15:57:58 -0700
committerRoland McGrath <mcgrathr@google.com>2013-10-30 16:01:06 -0700
commitdd0845d708ab82f931fd7b800b4d218842ed635f (patch)
treed5209766dae66ba80645d149af472de2f6a9ba90 /gold
parent856ff3311a36bfc89decc626cc759271ca0306fe (diff)
downloadgdb-dd0845d708ab82f931fd7b800b4d218842ed635f.zip
gdb-dd0845d708ab82f931fd7b800b4d218842ed635f.tar.gz
gdb-dd0845d708ab82f931fd7b800b4d218842ed635f.tar.bz2
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.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/x86_64.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6acb64e..ccfae9e 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-30 Alan Modra <amodra@gmail.com>
* powerpc.cc (Powerpc_relobj::abiversion, set_abiversion,
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index b95d2ed..b9f9f17 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