From 8ad93045edcff5128fccc8bff23848f2cfae6453 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 8 Dec 2022 09:12:13 +0100 Subject: ld, gold: remove support for -z bndplt (MPX prefix) bfd/ChangeLog: * elf-linker-x86.h (struct elf_linker_x86_params): Remove bndplt. * elf64-x86-64.c (elf_x86_64_scan_relocs): Ignore R_X86_64_PLT32_BND. (elf_x86_64_relocate_section): Similarly here. (elf_x86_64_link_setup_gnu_properties): Ignore bndplt. * elfxx-x86.c: Likewise. * elfxx-x86.h: Likewise. gold/ChangeLog: * NEWS: Document -z bndplt. * options.h (class General_options): Remove bndplt option. * x86_64.cc (class Output_data_plt_x86_64_bnd): Remove. (Target_x86_64::do_make_data_plt): Do not use Output_data_plt_x86_64_bnd. (Target_x86_64::Scan::get_reference_flags): Likewise. (Target_x86_64::Scan::check_non_pic): Likewise. (Target_x86_64::Scan::local): Likewise. (Target_x86_64::Scan::global): Likewise. ld/ChangeLog: * NEWS: Document -z bndplt. * emulparams/elf_x86_64.sh: Remove bndplt option. * ld.texi: Likewise. * testsuite/ld-x86-64/x86-64.exp: * testsuite/ld-x86-64/bnd-branch-1-now.d: Removed. * testsuite/ld-x86-64/bnd-branch-1.d: Removed. * testsuite/ld-x86-64/bnd-branch-1.s: Removed. * testsuite/ld-x86-64/bnd-ifunc-1-now.d: Removed. * testsuite/ld-x86-64/bnd-ifunc-1.d: Removed. * testsuite/ld-x86-64/bnd-ifunc-1.s: Removed. * testsuite/ld-x86-64/bnd-ifunc-2-now.d: Removed. * testsuite/ld-x86-64/bnd-ifunc-2.d: Removed. * testsuite/ld-x86-64/bnd-ifunc-2.s: Removed. * testsuite/ld-x86-64/bnd-plt-1-now.d: Removed. * testsuite/ld-x86-64/bnd-plt-1.d: Removed. * testsuite/ld-x86-64/mpx.exp: Removed. * testsuite/ld-x86-64/mpx1.out: Removed. * testsuite/ld-x86-64/mpx1a.c: Removed. * testsuite/ld-x86-64/mpx1a.rd: Removed. * testsuite/ld-x86-64/mpx1b.c: Removed. * testsuite/ld-x86-64/mpx1c.c: Removed. * testsuite/ld-x86-64/mpx1c.rd: Removed. * testsuite/ld-x86-64/mpx2.out: Removed. * testsuite/ld-x86-64/mpx2a.c: Removed. * testsuite/ld-x86-64/mpx2a.rd: Removed. * testsuite/ld-x86-64/mpx2b.c: Removed. * testsuite/ld-x86-64/mpx2c.c: Removed. * testsuite/ld-x86-64/mpx2c.rd: Removed. * testsuite/ld-x86-64/mpx3.dd: Removed. * testsuite/ld-x86-64/mpx3a.s: Removed. * testsuite/ld-x86-64/mpx3b.s: Removed. * testsuite/ld-x86-64/mpx3n.dd: Removed. * testsuite/ld-x86-64/mpx4.dd: Removed. * testsuite/ld-x86-64/mpx4a.s: Removed. * testsuite/ld-x86-64/mpx4b.s: Removed. * testsuite/ld-x86-64/mpx4n.dd: Removed. * testsuite/ld-x86-64/pr20800a.S: Removed. * testsuite/ld-x86-64/pr20800b.S: Removed. * testsuite/ld-x86-64/pr21038a-now.d: Removed. * testsuite/ld-x86-64/pr21038a.d: Removed. * testsuite/ld-x86-64/pr21038a.s: Removed. * testsuite/ld-x86-64/pr21038b-now.d: Removed. * testsuite/ld-x86-64/pr21038b.d: Removed. * testsuite/ld-x86-64/pr21038b.s: Removed. * testsuite/ld-x86-64/pr21038c-now.d: Removed. * testsuite/ld-x86-64/pr21038c.d: Removed. * testsuite/ld-x86-64/pr21038c.s: Removed. --- gold/NEWS | 3 + gold/options.h | 3 - gold/x86_64.cc | 436 +-------------------------------------------------------- 3 files changed, 5 insertions(+), 437 deletions(-) (limited to 'gold') diff --git a/gold/NEWS b/gold/NEWS index edc0015..cf451c1 100644 --- a/gold/NEWS +++ b/gold/NEWS @@ -1,7 +1,10 @@ * gold and dwp now support zstd compressed debug sections. + * The new option --compress-debug-sections=zstd compresses debug sections with zstd. +* Remove support for -z bndplt (MPX prefix instructions). + Changes in 1.16: * Improve warning messages for relocations that refer to discarded sections. diff --git a/gold/options.h b/gold/options.h index 7d61973..0f1fc96 100644 --- a/gold/options.h +++ b/gold/options.h @@ -1460,9 +1460,6 @@ class General_options // The -z options. - DEFINE_bool(bndplt, options::DASH_Z, '\0', false, - N_("(x86-64 only) Generate a BND PLT for Intel MPX"), - N_("Generate a regular PLT")); DEFINE_bool(combreloc, options::DASH_Z, '\0', true, N_("Sort dynamic relocs"), N_("Do not sort dynamic relocs")); diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 83684b9..0c04b9b 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -430,118 +430,6 @@ class Output_data_plt_x86_64_standard : public Output_data_plt_x86_64 static const unsigned char plt_eh_frame_fde[plt_eh_frame_fde_size]; }; -class Output_data_plt_x86_64_bnd : public Output_data_plt_x86_64<64> -{ - public: - Output_data_plt_x86_64_bnd(Layout* layout, - Output_data_got<64, false>* got, - Output_data_got_plt_x86_64* got_plt, - Output_data_space* got_irelative) - : Output_data_plt_x86_64<64>(layout, plt_entry_size, - got, got_plt, got_irelative), - aplt_offset_(0) - { } - - Output_data_plt_x86_64_bnd(Layout* layout, - Output_data_got<64, false>* got, - Output_data_got_plt_x86_64* got_plt, - Output_data_space* got_irelative, - unsigned int plt_count) - : Output_data_plt_x86_64<64>(layout, plt_entry_size, - got, got_plt, got_irelative, - plt_count), - aplt_offset_(0) - { } - - protected: - virtual unsigned int - do_get_plt_entry_size() const - { return plt_entry_size; } - - // Return the PLT address to use for a global symbol. - uint64_t - do_address_for_global(const Symbol*); - - // Return the PLT address to use for a local symbol. - uint64_t - do_address_for_local(const Relobj*, unsigned int symndx); - - virtual void - do_add_eh_frame(Layout* layout) - { - layout->add_eh_frame_for_plt(this, - this->plt_eh_frame_cie, - this->plt_eh_frame_cie_size, - plt_eh_frame_fde, - plt_eh_frame_fde_size); - } - - virtual void - do_fill_first_plt_entry(unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_addr, - elfcpp::Elf_types<64>::Elf_Addr plt_addr); - - virtual unsigned int - do_fill_plt_entry(unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address, - unsigned int got_offset, - unsigned int plt_offset, - unsigned int plt_index); - - virtual void - do_fill_tlsdesc_entry(unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address, - elfcpp::Elf_types<64>::Elf_Addr got_base, - unsigned int tlsdesc_got_offset, - unsigned int plt_offset); - - void - fill_aplt_entry(unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address, - unsigned int got_offset, - unsigned int plt_offset, - unsigned int plt_index); - - private: - // Set the final size. - void - set_final_data_size(); - - // Write out the BND PLT data. - void - do_write(Output_file*); - - // Offset of the Additional PLT (if using -z bndplt). - unsigned int aplt_offset_; - - // The size of an entry in the PLT. - static const int plt_entry_size = 16; - - // The size of an entry in the additional PLT. - static const int aplt_entry_size = 8; - - // The first entry in the PLT. - // From the AMD64 ABI: "Unlike Intel386 ABI, this ABI uses the same - // procedure linkage table for both programs and shared objects." - static const unsigned char first_plt_entry[plt_entry_size]; - - // Other entries in the PLT for an executable. - static const unsigned char plt_entry[plt_entry_size]; - - // Entries in the additional PLT. - static const unsigned char aplt_entry[aplt_entry_size]; - - // The reserved TLSDESC entry in the PLT for an executable. - static const unsigned char tlsdesc_plt_entry[plt_entry_size]; - - // The .eh_frame unwind information for the PLT. - static const int plt_eh_frame_fde_size = 32; - static const unsigned char plt_eh_frame_fde[plt_eh_frame_fde_size]; -}; - // We use this PLT when Indirect Branch Tracking (IBT) is enabled. template @@ -625,7 +513,7 @@ class Output_data_plt_x86_64_ibt : public Output_data_plt_x86_64 void set_final_data_size(); - // Write out the BND PLT data. + // Write out the PLT data. void do_write(Output_file*); @@ -2091,183 +1979,6 @@ Output_data_plt_x86_64_standard::do_fill_tlsdesc_entry( + 12))); } -// Return the APLT address to use for a global symbol (for -z bndplt). - -uint64_t -Output_data_plt_x86_64_bnd::do_address_for_global(const Symbol* gsym) -{ - uint64_t offset = this->aplt_offset_; - // Convert the PLT offset into an APLT offset. - unsigned int plt_offset = gsym->plt_offset(); - if (gsym->type() == elfcpp::STT_GNU_IFUNC - && gsym->can_use_relative_reloc(false)) - offset += this->regular_count() * aplt_entry_size; - else - plt_offset -= plt_entry_size; - plt_offset = plt_offset / (plt_entry_size / aplt_entry_size); - return this->address() + offset + plt_offset; -} - -// Return the PLT address to use for a local symbol. These are always -// IRELATIVE relocs. - -uint64_t -Output_data_plt_x86_64_bnd::do_address_for_local(const Relobj* object, - unsigned int r_sym) -{ - // Convert the PLT offset into an APLT offset. - const Sized_relobj_file<64, false>* sized_relobj = - static_cast*>(object); - const Symbol_value<64>* psymval = sized_relobj->local_symbol(r_sym); - unsigned int plt_offset = ((object->local_plt_offset(r_sym) - - (psymval->is_ifunc_symbol() - ? 0 : plt_entry_size)) - / (plt_entry_size / aplt_entry_size)); - return (this->address() - + this->aplt_offset_ - + this->regular_count() * aplt_entry_size - + plt_offset); -} - -// Set the final size. -void -Output_data_plt_x86_64_bnd::set_final_data_size() -{ - // Number of regular and IFUNC PLT entries. - unsigned int count = this->entry_count(); - // Count the first entry and the TLSDESC entry, if present. - unsigned int extra = this->has_tlsdesc_entry() ? 2 : 1; - unsigned int plt_size = (count + extra) * plt_entry_size; - // Offset of the APLT. - this->aplt_offset_ = plt_size; - // Size of the APLT. - plt_size += count * aplt_entry_size; - this->set_data_size(plt_size); -} - -// The first entry in the BND PLT. - -const unsigned char -Output_data_plt_x86_64_bnd::first_plt_entry[plt_entry_size] = -{ - // From AMD64 ABI Draft 0.98, page 76 - 0xff, 0x35, // pushq contents of memory address - 0, 0, 0, 0, // replaced with address of .got + 8 - 0xf2, 0xff, 0x25, // bnd jmp indirect - 0, 0, 0, 0, // replaced with address of .got + 16 - 0x0f, 0x1f, 0x00 // nop -}; - -void -Output_data_plt_x86_64_bnd::do_fill_first_plt_entry( - unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address) -{ - memcpy(pov, first_plt_entry, plt_entry_size); - // We do a jmp relative to the PC at the end of this instruction. - elfcpp::Swap_unaligned<32, false>::writeval(pov + 2, - (got_address + 8 - - (plt_address + 6))); - elfcpp::Swap<32, false>::writeval(pov + 9, - (got_address + 16 - - (plt_address + 13))); -} - -// Subsequent entries in the BND PLT. - -const unsigned char -Output_data_plt_x86_64_bnd::plt_entry[plt_entry_size] = -{ - // From AMD64 ABI Draft 0.99.8, page 139 - 0x68, // pushq immediate - 0, 0, 0, 0, // replaced with offset into relocation table - 0xf2, 0xe9, // bnd jmpq relative - 0, 0, 0, 0, // replaced with offset to start of .plt - 0x0f, 0x1f, 0x44, 0, 0 // nop -}; - -// Entries in the BND Additional PLT. - -const unsigned char -Output_data_plt_x86_64_bnd::aplt_entry[aplt_entry_size] = -{ - // From AMD64 ABI Draft 0.99.8, page 139 - 0xf2, 0xff, 0x25, // bnd jmpq indirect - 0, 0, 0, 0, // replaced with address of symbol in .got - 0x90, // nop -}; - -unsigned int -Output_data_plt_x86_64_bnd::do_fill_plt_entry( - unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr, - elfcpp::Elf_types<64>::Elf_Addr, - unsigned int, - unsigned int plt_offset, - unsigned int plt_index) -{ - memcpy(pov, plt_entry, plt_entry_size); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 1, plt_index); - elfcpp::Swap<32, false>::writeval(pov + 7, -(plt_offset + 11)); - return 0; -} - -void -Output_data_plt_x86_64_bnd::fill_aplt_entry( - unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address, - unsigned int got_offset, - unsigned int plt_offset, - unsigned int plt_index) -{ - // Check PC-relative offset overflow in PLT entry. - uint64_t plt_got_pcrel_offset = (got_address + got_offset - - (plt_address + plt_offset + 7)); - if (Bits<32>::has_overflow(plt_got_pcrel_offset)) - gold_error(_("PC-relative offset overflow in APLT entry %d"), - plt_index + 1); - - memcpy(pov, aplt_entry, aplt_entry_size); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 3, plt_got_pcrel_offset); -} - -// The reserved TLSDESC entry in the PLT for an executable. - -const unsigned char -Output_data_plt_x86_64_bnd::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). - 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) - 0, 0, 0, 0, // replaced with offset of reserved TLSDESC_GOT entry - 0x0f, 0x1f, 0 // nop -}; - -void -Output_data_plt_x86_64_bnd::do_fill_tlsdesc_entry( - unsigned char* pov, - elfcpp::Elf_types<64>::Elf_Addr got_address, - elfcpp::Elf_types<64>::Elf_Addr plt_address, - elfcpp::Elf_types<64>::Elf_Addr got_base, - unsigned int tlsdesc_got_offset, - unsigned int plt_offset) -{ - memcpy(pov, tlsdesc_plt_entry, plt_entry_size); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 2, - (got_address + 8 - - (plt_address + plt_offset - + 6))); - elfcpp::Swap_unaligned<32, false>::writeval(pov + 9, - (got_base - + tlsdesc_got_offset - - (plt_address + plt_offset - + 13))); -} - // Return the APLT address to use for a global symbol (for IBT). template @@ -2520,35 +2231,7 @@ Output_data_plt_x86_64_standard::plt_eh_frame_fde[plt_eh_frame_fde_size] = elfcpp::DW_CFA_nop }; -// The .eh_frame unwind information for the BND PLT. -const unsigned char -Output_data_plt_x86_64_bnd::plt_eh_frame_fde[plt_eh_frame_fde_size] = -{ - 0, 0, 0, 0, // Replaced with offset to .plt. - 0, 0, 0, 0, // Replaced with size of .plt. - 0, // Augmentation size. - elfcpp::DW_CFA_def_cfa_offset, 16, // DW_CFA_def_cfa_offset: 16. - elfcpp::DW_CFA_advance_loc + 6, // Advance 6 to __PLT__ + 6. - elfcpp::DW_CFA_def_cfa_offset, 24, // DW_CFA_def_cfa_offset: 24. - elfcpp::DW_CFA_advance_loc + 10, // Advance 10 to __PLT__ + 16. - elfcpp::DW_CFA_def_cfa_expression, // DW_CFA_def_cfa_expression. - 11, // Block length. - elfcpp::DW_OP_breg7, 8, // Push %rsp + 8. - elfcpp::DW_OP_breg16, 0, // Push %rip. - elfcpp::DW_OP_lit15, // Push 0xf. - elfcpp::DW_OP_and, // & (%rip & 0xf). - elfcpp::DW_OP_lit5, // Push 5. - elfcpp::DW_OP_ge, // >= ((%rip & 0xf) >= 5) - elfcpp::DW_OP_lit3, // Push 3. - elfcpp::DW_OP_shl, // << (((%rip & 0xf) >= 5) << 3) - elfcpp::DW_OP_plus, // + ((((%rip&0xf)>=5)<<3)+%rsp+8 - elfcpp::DW_CFA_nop, // Align to 32 bytes. - elfcpp::DW_CFA_nop, - elfcpp::DW_CFA_nop, - elfcpp::DW_CFA_nop -}; - -// The .eh_frame unwind information for the BND PLT. +// The .eh_frame unwind information for the PLT. template const unsigned char Output_data_plt_x86_64_ibt::plt_eh_frame_fde[plt_eh_frame_fde_size] = @@ -2656,101 +2339,6 @@ Output_data_plt_x86_64::do_write(Output_file* of) of->write_output_view(got_file_offset, got_size, got_view); } -// Write out the BND PLT. - -void -Output_data_plt_x86_64_bnd::do_write(Output_file* of) -{ - const off_t offset = this->offset(); - const section_size_type oview_size = - convert_to_section_size_type(this->data_size()); - unsigned char* const oview = of->get_output_view(offset, oview_size); - - Output_data_got<64, false>* got = this->got(); - Output_data_got_plt_x86_64* got_plt = this->got_plt(); - Output_data_space* got_irelative = this->got_irelative(); - - const off_t got_file_offset = got_plt->offset(); - gold_assert(parameters->incremental_update() - || (got_file_offset + got_plt->data_size() - == got_irelative->offset())); - const section_size_type got_size = - convert_to_section_size_type(got_plt->data_size() - + got_irelative->data_size()); - unsigned char* const got_view = of->get_output_view(got_file_offset, - got_size); - - unsigned char* pov = oview; - - // The base address of the .plt section. - elfcpp::Elf_types<64>::Elf_Addr plt_address = this->address(); - // The base address of the .got section. - elfcpp::Elf_types<64>::Elf_Addr got_base = got->address(); - // The base address of the PLT portion of the .got section, - // which is where the GOT pointer will point, and where the - // three reserved GOT entries are located. - elfcpp::Elf_types<64>::Elf_Addr got_address = got_plt->address(); - - this->fill_first_plt_entry(pov, got_address, plt_address); - pov += plt_entry_size; - - // The first three entries in the GOT are reserved, and are written - // by Output_data_got_plt_x86_64::do_write. - unsigned char* got_pov = got_view + 24; - - unsigned int plt_offset = plt_entry_size; - unsigned int got_offset = 24; - const unsigned int count = this->entry_count(); - for (unsigned int plt_index = 0; - plt_index < count; - ++plt_index, - pov += plt_entry_size, - got_pov += 8, - plt_offset += plt_entry_size, - got_offset += 8) - { - // Set and adjust the PLT entry itself. - unsigned int lazy_offset = this->fill_plt_entry(pov, - got_address, plt_address, - got_offset, plt_offset, - plt_index); - - // Set the entry in the GOT. - elfcpp::Swap<64, false>::writeval(got_pov, - plt_address + plt_offset + lazy_offset); - } - - if (this->has_tlsdesc_entry()) - { - // Set and adjust the reserved TLSDESC PLT entry. - unsigned int tlsdesc_got_offset = this->get_tlsdesc_got_offset(); - this->fill_tlsdesc_entry(pov, got_address, plt_address, got_base, - tlsdesc_got_offset, plt_offset); - pov += this->get_plt_entry_size(); - plt_offset += plt_entry_size; - } - - // Write the additional PLT. - got_offset = 24; - for (unsigned int plt_index = 0; - plt_index < count; - ++plt_index, - pov += aplt_entry_size, - plt_offset += aplt_entry_size, - got_offset += 8) - { - // Set and adjust the APLT entry. - this->fill_aplt_entry(pov, got_address, plt_address, got_offset, - plt_offset, plt_index); - } - - gold_assert(static_cast(pov - oview) == oview_size); - gold_assert(static_cast(got_pov - got_view) == got_size); - - of->write_output_view(offset, oview_size, oview); - of->write_output_view(got_file_offset, got_size, got_view); -} - // Write out the IBT PLT. template @@ -2900,9 +2488,6 @@ Target_x86_64<64>::do_make_data_plt(Layout* layout, if (this->feature_1_ & elfcpp::GNU_PROPERTY_X86_FEATURE_1_IBT) return new Output_data_plt_x86_64_ibt<64>(layout, got, got_plt, got_irelative); - else if (parameters->options().bndplt()) - return new Output_data_plt_x86_64_bnd(layout, got, got_plt, - got_irelative); else return new Output_data_plt_x86_64_standard<64>(layout, got, got_plt, got_irelative); @@ -2934,9 +2519,6 @@ Target_x86_64<64>::do_make_data_plt(Layout* layout, if (this->feature_1_ & elfcpp::GNU_PROPERTY_X86_FEATURE_1_IBT) return new Output_data_plt_x86_64_ibt<64>(layout, got, got_plt, got_irelative, plt_count); - else if (parameters->options().bndplt()) - return new Output_data_plt_x86_64_bnd(layout, got, got_plt, - got_irelative, plt_count); else return new Output_data_plt_x86_64_standard<64>(layout, got, got_plt, got_irelative, @@ -3374,14 +2956,12 @@ Target_x86_64::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_X86_64_PC64: case elfcpp::R_X86_64_PC32: - case elfcpp::R_X86_64_PC32_BND: case elfcpp::R_X86_64_PC16: case elfcpp::R_X86_64_PC8: case elfcpp::R_X86_64_GOTOFF64: return Symbol::RELATIVE_REF; case elfcpp::R_X86_64_PLT32: - case elfcpp::R_X86_64_PLT32_BND: case elfcpp::R_X86_64_PLTOFF64: return Symbol::FUNCTION_CALL | Symbol::RELATIVE_REF; @@ -3465,7 +3045,6 @@ Target_x86_64::Scan::check_non_pic(Relobj* object, unsigned int r_type, // glibc supports these reloc types, but they can overflow. case elfcpp::R_X86_64_PC32: - case elfcpp::R_X86_64_PC32_BND: // A PC relative reference is OK against a local symbol or if // the symbol is defined locally. if (gsym == NULL @@ -3495,9 +3074,6 @@ Target_x86_64::Scan::check_non_pic(Relobj* object, unsigned int r_type, case elfcpp::R_X86_64_PC32: r_name = "R_X86_64_PC32"; break; - case elfcpp::R_X86_64_PC32_BND: - r_name = "R_X86_64_PC32_BND"; - break; default: gold_unreachable(); break; @@ -3650,13 +3226,11 @@ Target_x86_64::Scan::local(Symbol_table* symtab, case elfcpp::R_X86_64_PC64: case elfcpp::R_X86_64_PC32: - case elfcpp::R_X86_64_PC32_BND: case elfcpp::R_X86_64_PC16: case elfcpp::R_X86_64_PC8: break; case elfcpp::R_X86_64_PLT32: - case elfcpp::R_X86_64_PLT32_BND: // Since we know this is a local symbol, we can handle this as a // PC32 reloc. break; @@ -4107,7 +3681,6 @@ Target_x86_64::Scan::global(Symbol_table* symtab, case elfcpp::R_X86_64_PC64: case elfcpp::R_X86_64_PC32: - case elfcpp::R_X86_64_PC32_BND: case elfcpp::R_X86_64_PC16: case elfcpp::R_X86_64_PC8: { @@ -4240,7 +3813,6 @@ Target_x86_64::Scan::global(Symbol_table* symtab, break; case elfcpp::R_X86_64_PLT32: - case elfcpp::R_X86_64_PLT32_BND: // If the symbol is fully resolved, this is just a PC32 reloc. // Otherwise we need a PLT entry. if (gsym->final_value_is_known()) @@ -4658,8 +4230,6 @@ Target_x86_64::Relocate::relocate( if ((r_type != elfcpp::R_X86_64_PLT32 && r_type != elfcpp::R_X86_64_GOTPCREL && r_type != elfcpp::R_X86_64_GOTPCRELX - && r_type != elfcpp::R_X86_64_PLT32_BND - && r_type != elfcpp::R_X86_64_PC32_BND && r_type != elfcpp::R_X86_64_PC32) || gsym == NULL || strcmp(gsym->name(), "__tls_get_addr") != 0) @@ -4762,7 +4332,6 @@ Target_x86_64::Relocate::relocate( break; case elfcpp::R_X86_64_PC32: - case elfcpp::R_X86_64_PC32_BND: rstatus = Reloc_funcs::pcrela32_check(view, object, psymval, addend, address); break; @@ -4784,7 +4353,6 @@ Target_x86_64::Relocate::relocate( break; case elfcpp::R_X86_64_PLT32: - case elfcpp::R_X86_64_PLT32_BND: gold_assert(gsym == NULL || gsym->has_plt_offset() || gsym->final_value_is_known() -- cgit v1.1