diff options
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/x86_64.cc | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 53bb030..a03163e 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2020-11-29 H.J. Lu <hongjiu.lu@intel.com> + PR ld/26972 + * x86_64.cc (Output_data_plt_x86_64_ibt::tlsdesc_plt_entry): Add + endbr64. + (Output_data_plt_x86_64_ibt::do_fill_tlsdesc_entry): Adjusted. + +2020-11-29 H.J. Lu <hongjiu.lu@intel.com> + PR gold/26939 * x86_64.cc (Target_x86_64<size>::Scan::local): Check get_r_addend() == -4 for GOTPCRELX conversion. diff --git a/gold/x86_64.cc b/gold/x86_64.cc index ddf4722..b570d6f 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -2480,11 +2480,11 @@ Output_data_plt_x86_64_ibt<size>::tlsdesc_plt_entry[plt_entry_size] = { // From Alexandre Oliva, "Thread-Local Storage Descriptors for IA32 // and AMD64/EM64T", Version 0.9.4 (2005-10-10). + 0xf3, 0x0f, 0x1e, 0xfa, // endbr64 0xff, 0x35, // pushq x(%rip) 0, 0, 0, 0, // replaced with address of linkmap GOT entry (at PLTGOT + 8) - 0xf2, 0xff, 0x25, // jmpq *y(%rip) + 0xff, 0x25, // jmpq *y(%rip) 0, 0, 0, 0, // replaced with offset of reserved TLSDESC_GOT entry - 0x0f, 0x1f, 0 // nop }; template<int size> @@ -2498,15 +2498,15 @@ Output_data_plt_x86_64_ibt<size>::do_fill_tlsdesc_entry( unsigned int plt_offset) { memcpy(pov, tlsdesc_plt_entry, plt_entry_size); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 2, + elfcpp::Swap_unaligned<32, false>::writeval(pov + 6, (got_address + 8 - (plt_address + plt_offset - + 6))); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 9, + + 10))); + elfcpp::Swap_unaligned<32, false>::writeval(pov + 12, (got_base + tlsdesc_got_offset - (plt_address + plt_offset - + 13))); + + 16))); } // The .eh_frame unwind information for the PLT. |