From dd0845d708ab82f931fd7b800b4d218842ed635f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Oct 2013 15:57:58 -0700 Subject: [PATCH] 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. --- gold/ChangeLog | 5 +++++ gold/x86_64.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 6acb64e94b5..ccfae9eb58e 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2013-10-30 Roland McGrath + + * 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 * powerpc.cc (Powerpc_relobj::abiversion, set_abiversion, diff --git a/gold/x86_64.cc b/gold/x86_64.cc index b95d2ed8f2d..b9f9f17accf 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -4649,7 +4649,7 @@ Output_data_plt_x86_64_nacl::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 -- 2.30.2