X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fpowerpc.cc;h=ad35095ccd585412619ff62b72d05c318c1c639c;hb=260bcd09bfb98ebc5d8f0eb564edca21872e9f7f;hp=068f5ca602addb1382f708deda3a9ed431685638;hpb=1c3a5fbe155614a0f87079b953df0d7618e0ab50;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 068f5ca602..ad35095ccd 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -1,6 +1,6 @@ // powerpc.cc -- powerpc target support for gold. -// Copyright (C) 2008-2016 Free Software Foundation, Inc. +// Copyright (C) 2008-2019 Free Software Foundation, Inc. // Written by David S. Miller // and David Edelsohn @@ -41,6 +41,7 @@ #include "tls.h" #include "errors.h" #include "gc.h" +#include "attributes.h" namespace { @@ -78,8 +79,14 @@ struct Stub_table_owner const Output_section::Input_section* owner; }; -inline bool -is_branch_reloc(unsigned int r_type); +template +inline bool is_branch_reloc(unsigned int); + +template +inline bool is_plt16_reloc(unsigned int); + +// Counter incremented on every Powerpc_relobj constructed. +static uint32_t object_id = 0; template class Powerpc_relobj : public Sized_relobj_file @@ -92,20 +99,68 @@ public: Powerpc_relobj(const std::string& name, Input_file* input_file, off_t offset, const typename elfcpp::Ehdr& ehdr) : Sized_relobj_file(name, input_file, offset, ehdr), - special_(0), has_small_toc_reloc_(false), opd_valid_(false), - opd_ent_(), access_from_map_(), has14_(), stub_table_index_(), - e_flags_(ehdr.get_e_flags()), st_other_() + uniq_(object_id++), special_(0), relatoc_(0), toc_(0), + has_small_toc_reloc_(false), opd_valid_(false), + e_flags_(ehdr.get_e_flags()), no_toc_opt_(), opd_ent_(), + access_from_map_(), has14_(), stub_table_index_(), st_other_(), + attributes_section_data_(NULL) { this->set_abiversion(0); } ~Powerpc_relobj() - { } + { delete this->attributes_section_data_; } // Read the symbols then set up st_other vector. void do_read_symbols(Read_symbols_data*); + // Arrange to always relocate .toc first. + virtual void + do_relocate_sections( + const Symbol_table* symtab, const Layout* layout, + const unsigned char* pshdrs, Output_file* of, + typename Sized_relobj_file::Views* pviews); + + // The .toc section index. + unsigned int + toc_shndx() const + { + return this->toc_; + } + + // Mark .toc entry at OFF as not optimizable. + void + set_no_toc_opt(Address off) + { + if (this->no_toc_opt_.empty()) + this->no_toc_opt_.resize(this->section_size(this->toc_shndx()) + / (size / 8)); + off /= size / 8; + if (off < this->no_toc_opt_.size()) + this->no_toc_opt_[off] = true; + } + + // Mark the entire .toc as not optimizable. + void + set_no_toc_opt() + { + this->no_toc_opt_.resize(1); + this->no_toc_opt_[0] = true; + } + + // Return true if code using the .toc entry at OFF should not be edited. + bool + no_toc_opt(Address off) const + { + if (this->no_toc_opt_.empty()) + return false; + off /= size / 8; + if (off >= this->no_toc_opt_.size()) + return true; + return this->no_toc_opt_[off]; + } + // The .got2 section shndx. unsigned int got2_shndx() const @@ -188,6 +243,18 @@ public: const unsigned char* prelocs, const unsigned char* plocal_syms); + // Returns true if a code sequence loading a TOC entry can be + // converted into code calculating a TOC pointer relative offset. + bool + make_toc_relative(Target_powerpc* target, + Address* value); + + bool + make_got_relative(Target_powerpc* target, + const Symbol_value* psymval, + Address addend, + Address* value); + // Perform the Sized_relobj_file method, then set up opd info from // .opd relocs. void @@ -292,8 +359,8 @@ public: = static_cast*>( parameters->sized_target()); unsigned int indx = this->stub_table_index_[shndx]; - gold_assert(indx < target->stub_tables().size()); - return target->stub_tables()[indx]; + if (indx < target->stub_tables().size()) + return target->stub_tables()[indx]; } return NULL; } @@ -304,6 +371,10 @@ public: this->stub_table_index_.clear(); } + uint32_t + uniq() const + { return this->uniq_; } + int abiversion() const { return this->e_flags_ & elfcpp::EF_PPC64_ABI; } @@ -312,6 +383,12 @@ public: void set_abiversion(int ver); + unsigned int + st_other (unsigned int symndx) const + { + return this->st_other_[symndx]; + } + unsigned int ppc64_local_entry_offset(const Symbol* sym) const { return elfcpp::ppc64_decode_local_entry(sym->nonvis() >> 3); } @@ -320,6 +397,19 @@ public: ppc64_local_entry_offset(unsigned int symndx) const { return elfcpp::ppc64_decode_local_entry(this->st_other_[symndx] >> 5); } + bool + ppc64_needs_toc(const Symbol* sym) const + { return sym->nonvis() > 1 << 3; } + + bool + ppc64_needs_toc(unsigned int symndx) const + { return this->st_other_[symndx] > 1 << 5; } + + // The contents of the .gnu.attributes section if there is one. + const Attributes_section_data* + attributes_section_data() const + { return this->attributes_section_data_; } + private: struct Opd_ent { @@ -343,9 +433,16 @@ private: opd_ent_ndx(size_t off) const { return off >> 4;} + // Per object unique identifier + uint32_t uniq_; + // For 32-bit the .got2 section shdnx, for 64-bit the .opd section shndx. unsigned int special_; + // For 64-bit the .rela.toc and .toc section shdnx. + unsigned int relatoc_; + unsigned int toc_; + // For 64-bit, whether this object uses small model relocs to access // the toc. bool has_small_toc_reloc_; @@ -357,6 +454,13 @@ private: // access_from_map_. bool opd_valid_; + // Header e_flags + elfcpp::Elf_Word e_flags_; + + // For 64-bit, an array with one entry per 64-bit word in the .toc + // section, set if accesses using that word cannot be optimised. + std::vector no_toc_opt_; + // The first 8-byte word of an OPD entry gives the address of the // entry point of the function. Relocatable object files have a // relocation on this word. The following vector records the @@ -374,11 +478,11 @@ private: // The stub table to use for a given input section. std::vector stub_table_index_; - // Header e_flags - elfcpp::Elf_Word e_flags_; - // ELF st_other field for local symbols. std::vector st_other_; + + // Object attributes if there is a .gnu.attributes section. + Attributes_section_data* attributes_section_data_; }; template @@ -390,13 +494,14 @@ public: Powerpc_dynobj(const std::string& name, Input_file* input_file, off_t offset, const typename elfcpp::Ehdr& ehdr) : Sized_dynobj(name, input_file, offset, ehdr), - opd_shndx_(0), opd_ent_(), e_flags_(ehdr.get_e_flags()) + opd_shndx_(0), e_flags_(ehdr.get_e_flags()), opd_ent_(), + attributes_section_data_(NULL) { this->set_abiversion(0); } ~Powerpc_dynobj() - { } + { delete this->attributes_section_data_; } // Call Sized_dynobj::do_read_symbols to read the symbols then // read .opd from a dynamic object, filling in opd_ent_ vector, @@ -455,6 +560,11 @@ public: void set_abiversion(int ver); + // The contents of the .gnu.attributes section if there is one. + const Attributes_section_data* + attributes_section_data() const + { return this->attributes_section_data_; } + private: // Used to specify extent of executable sections. struct Sec_info @@ -487,14 +597,34 @@ private: unsigned int opd_shndx_; Address opd_address_; + // Header e_flags + elfcpp::Elf_Word e_flags_; + // The first 8-byte word of an OPD entry gives the address of the // entry point of the function. Records the section and offset // corresponding to the address. Note that in dynamic objects, // offset is *not* relative to the section. std::vector opd_ent_; - // Header e_flags - elfcpp::Elf_Word e_flags_; + // Object attributes if there is a .gnu.attributes section. + Attributes_section_data* attributes_section_data_; +}; + +// Powerpc_copy_relocs class. Needed to peek at dynamic relocs the +// base class will emit. + +template +class Powerpc_copy_relocs : public Copy_relocs +{ + public: + Powerpc_copy_relocs() + : Copy_relocs(elfcpp::R_POWERPC_COPY) + { } + + // Emit any saved relocations which turn out to be needed. This is + // called after all the relocs have been scanned. + void + emit(Output_data_reloc*); }; template @@ -505,6 +635,7 @@ class Target_powerpc : public Sized_target Output_data_reloc Reloc_section; typedef typename elfcpp::Elf_types::Elf_Addr Address; typedef typename elfcpp::Elf_types::Elf_Swxword Signed_address; + typedef Unordered_set Tocsave_loc; static const Address invalid_address = static_cast
(0) - 1; // Offset of tp and dtp pointers from start of TLS block. static const Address tp_offset = 0x7000; @@ -512,12 +643,18 @@ class Target_powerpc : public Sized_target Target_powerpc() : Sized_target(&powerpc_info), - got_(NULL), plt_(NULL), iplt_(NULL), brlt_section_(NULL), - glink_(NULL), rela_dyn_(NULL), copy_relocs_(elfcpp::R_POWERPC_COPY), + got_(NULL), plt_(NULL), iplt_(NULL), lplt_(NULL), brlt_section_(NULL), + glink_(NULL), rela_dyn_(NULL), copy_relocs_(), tlsld_got_offset_(-1U), - stub_tables_(), branch_lookup_table_(), branch_info_(), - plt_thread_safe_(false), relax_failed_(false), relax_fail_count_(0), - stub_group_size_(0), savres_section_(0) + stub_tables_(), branch_lookup_table_(), branch_info_(), tocsave_loc_(), + powerxx_stubs_(false), plt_thread_safe_(false), plt_localentry0_(false), + plt_localentry0_init_(false), has_localentry0_(false), + has_tls_get_addr_opt_(false), + relax_failed_(false), relax_fail_count_(0), + stub_group_size_(0), savres_section_(0), + tls_get_addr_(NULL), tls_get_addr_opt_(NULL), + attributes_section_data_(NULL), + last_fp_(NULL), last_ld_(NULL), last_vec_(NULL), last_struct_(NULL) { } @@ -592,6 +729,39 @@ class Target_powerpc : public Sized_target ppc_object->set_has_14bit_branch(data_shndx); } + // Return whether the last branch is a plt call, and if so, mark the + // branch as having an R_PPC64_TOCSAVE. + bool + mark_pltcall(Powerpc_relobj* ppc_object, + unsigned int data_shndx, Address r_offset, Symbol_table* symtab) + { + return (size == 64 + && !this->branch_info_.empty() + && this->branch_info_.back().mark_pltcall(ppc_object, data_shndx, + r_offset, this, symtab)); + } + + // Say the given location, that of a nop in a function prologue with + // an R_PPC64_TOCSAVE reloc, will be used to save r2. + // R_PPC64_TOCSAVE relocs on nops following calls point at this nop. + void + add_tocsave(Powerpc_relobj* ppc_object, + unsigned int shndx, Address offset) + { + Symbol_location loc; + loc.object = ppc_object; + loc.shndx = shndx; + loc.offset = offset; + this->tocsave_loc_.insert(loc); + } + + // Accessor + const Tocsave_loc + tocsave_loc() const + { + return this->tocsave_loc_; + } + void do_define_standard_symbols(Symbol_table*, Layout*); @@ -728,6 +898,40 @@ class Target_powerpc : public Sized_target return this->iplt_; } + // Get the LPLT section. + const Output_data_plt_powerpc* + lplt_section() const + { + return this->lplt_; + } + + // Return the plt offset and section for the given global sym. + Address + plt_off(const Symbol* gsym, + const Output_data_plt_powerpc** sec) const + { + if (gsym->type() == elfcpp::STT_GNU_IFUNC + && gsym->can_use_relative_reloc(false)) + *sec = this->iplt_section(); + else + *sec = this->plt_section(); + return gsym->plt_offset(); + } + + // Return the plt offset and section for the given local sym. + Address + plt_off(const Sized_relobj_file* relobj, + unsigned int local_sym_index, + const Output_data_plt_powerpc** sec) const + { + const Symbol_value* lsym = relobj->local_symbol(local_sym_index); + if (lsym->is_ifunc_symbol()) + *sec = this->iplt_section(); + else + *sec = this->lplt_section(); + return relobj->local_plt_offset(local_sym_index); + } + // Get the .glink section. const Output_data_glink* glink_section() const @@ -857,16 +1061,103 @@ class Target_powerpc : public Sized_target } } + // Wrapper used after relax to define a local symbol in output data, + // from the end if value < 0. + void + define_local(Symbol_table* symtab, const char* name, + Output_data* od, Address value, unsigned int symsize) + { + Symbol* sym + = symtab->define_in_output_data(name, NULL, Symbol_table::PREDEFINED, + od, value, symsize, elfcpp::STT_NOTYPE, + elfcpp::STB_LOCAL, elfcpp::STV_HIDDEN, 0, + static_cast(value) < 0, + false); + // We are creating this symbol late, so need to fix up things + // done early in Layout::finalize. + sym->set_dynsym_index(-1U); + } + + bool + powerxx_stubs() const + { return this->powerxx_stubs_; } + + void + set_powerxx_stubs() + { + this->powerxx_stubs_ = true; + } + bool plt_thread_safe() const { return this->plt_thread_safe_; } + bool + plt_localentry0() const + { return this->plt_localentry0_; } + + void + set_has_localentry0() + { + this->has_localentry0_ = true; + } + + bool + is_elfv2_localentry0(const Symbol* gsym) const + { + return (size == 64 + && this->abiversion() >= 2 + && this->plt_localentry0() + && gsym->type() == elfcpp::STT_FUNC + && gsym->is_defined() + && gsym->nonvis() >> 3 == 0 + && !gsym->non_zero_localentry()); + } + + bool + is_elfv2_localentry0(const Sized_relobj_file* object, + unsigned int r_sym) const + { + const Powerpc_relobj* ppc_object + = static_cast*>(object); + + if (size == 64 + && this->abiversion() >= 2 + && this->plt_localentry0() + && ppc_object->st_other(r_sym) >> 5 == 0) + { + const Symbol_value* psymval = object->local_symbol(r_sym); + bool is_ordinary; + if (!psymval->is_ifunc_symbol() + && psymval->input_shndx(&is_ordinary) != elfcpp::SHN_UNDEF + && is_ordinary) + return true; + } + return false; + } + + // Remember any symbols seen with non-zero localentry, even those + // not providing a definition + bool + resolve(Symbol* to, const elfcpp::Sym& sym, Object*, + const char*) + { + if (size == 64) + { + unsigned char st_other = sym.get_st_other(); + if ((st_other & elfcpp::STO_PPC64_LOCAL_MASK) != 0) + to->set_non_zero_localentry(); + } + // We haven't resolved anything, continue normal processing. + return false; + } + int - abiversion () const + abiversion() const { return this->processor_specific_flags() & elfcpp::EF_PPC64_ABI; } void - set_abiversion (int ver) + set_abiversion(int ver) { elfcpp::Elf_Word flags = this->processor_specific_flags(); flags &= ~elfcpp::EF_PPC64_ABI; @@ -874,11 +1165,47 @@ class Target_powerpc : public Sized_target this->set_processor_specific_flags(flags); } - // Offset to to save stack slot + Symbol* + tls_get_addr_opt() const + { return this->tls_get_addr_opt_; } + + Symbol* + tls_get_addr() const + { return this->tls_get_addr_; } + + // If optimizing __tls_get_addr calls, whether this is the + // "__tls_get_addr" symbol. + bool + is_tls_get_addr_opt(const Symbol* gsym) const + { + return this->tls_get_addr_opt_ && (gsym == this->tls_get_addr_ + || gsym == this->tls_get_addr_opt_); + } + + bool + replace_tls_get_addr(const Symbol* gsym) const + { return this->tls_get_addr_opt_ && gsym == this->tls_get_addr_; } + + void + set_has_tls_get_addr_opt() + { this->has_tls_get_addr_opt_ = true; } + + // Offset to toc save stack slot int - stk_toc () const + stk_toc() const { return this->abiversion() < 2 ? 40 : 24; } + // Offset to linker save stack slot. ELFv2 doesn't have a linker word, + // so use the CR save slot. Used only by __tls_get_addr call stub, + // relying on __tls_get_addr not saving CR itself. + int + stk_linker() const + { return this->abiversion() < 2 ? 32 : 8; } + + // Merge object attributes from input object with those in the output. + void + merge_object_attributes(const char*, const Attributes_section_data*); + private: class Track_tls @@ -893,13 +1220,13 @@ class Target_powerpc : public Sized_target }; Track_tls() - : tls_get_addr_(NOT_EXPECTED), + : tls_get_addr_state_(NOT_EXPECTED), relinfo_(NULL), relnum_(0), r_offset_(0) { } ~Track_tls() { - if (this->tls_get_addr_ != NOT_EXPECTED) + if (this->tls_get_addr_state_ != NOT_EXPECTED) this->missing(); } @@ -917,7 +1244,7 @@ class Target_powerpc : public Sized_target size_t relnum, Address r_offset) { - this->tls_get_addr_ = EXPECTED; + this->tls_get_addr_state_ = EXPECTED; this->relinfo_ = relinfo; this->relnum_ = relnum; this->r_offset_ = r_offset; @@ -925,21 +1252,32 @@ class Target_powerpc : public Sized_target void expect_tls_get_addr_call() - { this->tls_get_addr_ = EXPECTED; } + { this->tls_get_addr_state_ = EXPECTED; } void skip_next_tls_get_addr_call() - {this->tls_get_addr_ = SKIP; } + {this->tls_get_addr_state_ = SKIP; } Tls_get_addr - maybe_skip_tls_get_addr_call(unsigned int r_type, const Symbol* gsym) - { - bool is_tls_call = ((r_type == elfcpp::R_POWERPC_REL24 - || r_type == elfcpp::R_PPC_PLTREL24) - && gsym != NULL - && strcmp(gsym->name(), "__tls_get_addr") == 0); - Tls_get_addr last_tls = this->tls_get_addr_; - this->tls_get_addr_ = NOT_EXPECTED; + maybe_skip_tls_get_addr_call(Target_powerpc* target, + unsigned int r_type, const Symbol* gsym) + { + bool is_tls_call + = ((r_type == elfcpp::R_POWERPC_REL24 + || (size == 64 && r_type == elfcpp::R_PPC64_REL24_NOTOC) + || r_type == elfcpp::R_PPC_PLTREL24 + || is_plt16_reloc(r_type) + || r_type == elfcpp::R_PPC64_PLT_PCREL34 + || r_type == elfcpp::R_PPC64_PLT_PCREL34_NOTOC + || r_type == elfcpp::R_POWERPC_PLTSEQ + || r_type == elfcpp::R_POWERPC_PLTCALL + || r_type == elfcpp::R_PPC64_PLTSEQ_NOTOC + || r_type == elfcpp::R_PPC64_PLTCALL_NOTOC) + && gsym != NULL + && (gsym == target->tls_get_addr() + || gsym == target->tls_get_addr_opt())); + Tls_get_addr last_tls = this->tls_get_addr_state_; + this->tls_get_addr_state_ = NOT_EXPECTED; if (is_tls_call && last_tls != EXPECTED) return last_tls; else if (!is_tls_call && last_tls != NOT_EXPECTED) @@ -955,14 +1293,14 @@ class Target_powerpc : public Sized_target // On powerpc, the branch and link insn making a call to // __tls_get_addr is marked with a relocation, R_PPC64_TLSGD, // R_PPC64_TLSLD, R_PPC_TLSGD or R_PPC_TLSLD, in addition to the - // usual R_POWERPC_REL24 or R_PPC_PLTREL25 relocation on a call. + // usual R_POWERPC_REL24 or R_PPC_PLTREL24 relocation on a call. // The marker relocation always comes first, and has the same // symbol as the reloc on the insn setting up the __tls_get_addr // argument. This ties the arg setup insn with the call insn, // allowing ld to safely optimize away the call. We check that // every call to __tls_get_addr has a marker relocation, and that // every marker relocation is on a call to __tls_get_addr. - Tls_get_addr tls_get_addr_; + Tls_get_addr tls_get_addr_state_; // Info about the last reloc for error message. const Relocate_info* relinfo_; size_t relnum_; @@ -1021,7 +1359,7 @@ class Target_powerpc : public Sized_target } // For 32-bit and ELFv2, conservatively assume anything but calls to // function code might be taking the address of the function. - return !is_branch_reloc(r_type); + return !is_branch_reloc(r_type); } inline bool @@ -1042,7 +1380,7 @@ class Target_powerpc : public Sized_target if (ppcobj->abiversion() == 1) return false; } - return !is_branch_reloc(r_type); + return !is_branch_reloc(r_type); } static bool @@ -1108,7 +1446,7 @@ class Target_powerpc : public Sized_target { gold::Default_comdat_behavior default_behavior; Comdat_behavior ret = default_behavior.get(name); - if (ret == CB_WARNING) + if (ret == CB_ERROR) { if (size == 32 && (strcmp(name, ".fixup") == 0 @@ -1133,7 +1471,8 @@ class Target_powerpc : public Sized_target { // If we are generating a shared library, then we can't do anything // in the linker. - if (parameters->options().shared()) + if (parameters->options().shared() + || !parameters->options().tls_optimize()) return tls::TLSOPT_NONE; if (!is_final) @@ -1144,7 +1483,8 @@ class Target_powerpc : public Sized_target tls::Tls_optimization optimize_tls_ld() { - if (parameters->options().shared()) + if (parameters->options().shared() + || !parameters->options().tls_optimize()) return tls::TLSOPT_NONE; return tls::TLSOPT_TO_LE; @@ -1153,7 +1493,9 @@ class Target_powerpc : public Sized_target tls::Tls_optimization optimize_tls_ie(bool is_final) { - if (!is_final || parameters->options().shared()) + if (!is_final + || parameters->options().shared() + || !parameters->options().tls_optimize()) return tls::TLSOPT_NONE; return tls::TLSOPT_TO_LE; @@ -1170,6 +1512,9 @@ class Target_powerpc : public Sized_target void make_iplt_section(Symbol_table*, Layout*); + void + make_lplt_section(Layout*); + void make_brlt_section(Layout*); @@ -1183,6 +1528,12 @@ class Target_powerpc : public Sized_target Sized_relobj_file*, unsigned int); + // Create a PLT entry for a local non-IFUNC symbol. + void + make_local_plt_entry(Layout*, + Sized_relobj_file*, + unsigned int); + // Create a GOT entry for local dynamic __tls_get_addr. unsigned int @@ -1241,12 +1592,19 @@ class Target_powerpc : public Sized_target unsigned int r_sym, Address addend) : object_(ppc_object), shndx_(data_shndx), offset_(r_offset), - r_type_(r_type), r_sym_(r_sym), addend_(addend) + r_type_(r_type), tocsave_ (0), r_sym_(r_sym), addend_(addend) { } ~Branch_info() { } + // Return whether this branch is going via a plt call stub, and if + // so, mark it as having an R_PPC64_TOCSAVE. + bool + mark_pltcall(Powerpc_relobj* ppc_object, + unsigned int shndx, Address offset, + Target_powerpc* target, Symbol_table* symtab); + // If this branch needs a plt call stub, or a long branch stub, make one. bool make_stub(Stub_table*, @@ -1259,7 +1617,8 @@ class Target_powerpc : public Sized_target unsigned int shndx_; Address offset_; // ..and the branch type and destination. - unsigned int r_type_; + unsigned int r_type_ : 31; + unsigned int tocsave_ : 1; unsigned int r_sym_; Address addend_; }; @@ -1307,6 +1666,8 @@ class Target_powerpc : public Sized_target // section is emitted and marked with __rela_iplt_start and // __rela_iplt_end symbols. Output_data_plt_powerpc* iplt_; + // A PLT style section for local, non-ifunc symbols + Output_data_plt_powerpc* lplt_; // Section holding long branch destinations. Output_data_brlt_powerpc* brlt_section_; // The .glink section. @@ -1314,7 +1675,7 @@ class Target_powerpc : public Sized_target // The dynamic reloc section. Reloc_section* rela_dyn_; // Relocs saved to avoid a COPY reloc. - Copy_relocs copy_relocs_; + Powerpc_copy_relocs copy_relocs_; // Offset of the GOT entry for local dynamic __tls_get_addr calls. unsigned int tlsld_got_offset_; @@ -1324,14 +1685,34 @@ class Target_powerpc : public Sized_target typedef std::vector Branches; Branches branch_info_; + Tocsave_loc tocsave_loc_; + bool powerxx_stubs_; bool plt_thread_safe_; + bool plt_localentry0_; + bool plt_localentry0_init_; + bool has_localentry0_; + bool has_tls_get_addr_opt_; bool relax_failed_; int relax_fail_count_; int32_t stub_group_size_; Output_data_save_res *savres_section_; + + // The "__tls_get_addr" symbol, if present + Symbol* tls_get_addr_; + // If optimizing __tls_get_addr calls, the "__tls_get_addr_opt" symbol. + Symbol* tls_get_addr_opt_; + + // Attributes in output. + Attributes_section_data* attributes_section_data_; + + // Last input file to change various attribute tags + const char* last_fp_; + const char* last_ld_; + const char* last_vec_; + const char* last_struct_; }; template<> @@ -1360,6 +1741,7 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1388,6 +1770,7 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1397,9 +1780,9 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info = true, // is_big_endian elfcpp::EM_PPC64, // machine_code false, // has_make_symbol - false, // has_resolve + true, // has_resolve false, // has_code_fill - true, // is_default_stack_executable + false, // is_default_stack_executable false, // can_icf_inline_merge_sections '\0', // wrap_char "/usr/lib/ld.so.1", // dynamic_linker @@ -1416,6 +1799,7 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1425,9 +1809,9 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info = false, // is_big_endian elfcpp::EM_PPC64, // machine_code false, // has_make_symbol - false, // has_resolve + true, // has_resolve false, // has_code_fill - true, // is_default_stack_executable + false, // is_default_stack_executable false, // can_icf_inline_merge_sections '\0', // wrap_char "/usr/lib/ld.so.1", // dynamic_linker @@ -1444,12 +1828,15 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; +template inline bool is_branch_reloc(unsigned int r_type) { return (r_type == elfcpp::R_POWERPC_REL24 + || (size == 64 && r_type == elfcpp::R_PPC64_REL24_NOTOC) || r_type == elfcpp::R_PPC_PLTREL24 || r_type == elfcpp::R_PPC_LOCAL24PC || r_type == elfcpp::R_POWERPC_REL14 @@ -1461,6 +1848,17 @@ is_branch_reloc(unsigned int r_type) || r_type == elfcpp::R_POWERPC_ADDR14_BRNTAKEN); } +// Reloc resolves to plt entry. +template +inline bool +is_plt16_reloc(unsigned int r_type) +{ + return (r_type == elfcpp::R_POWERPC_PLT16_LO + || r_type == elfcpp::R_POWERPC_PLT16_HI + || r_type == elfcpp::R_POWERPC_PLT16_HA + || (size == 64 && r_type == elfcpp::R_PPC64_PLT16_LO_DS)); +} + // If INSN is an opcode that may be used with an @tls operand, return // the transformed insn for TLS optimisation, otherwise return 0. If // REG is non-zero only match an insn with RB or RA equal to REG. @@ -1598,11 +1996,15 @@ private: typedef typename elfcpp::Swap::Valtype Valtype; Valtype* wv = reinterpret_cast(view); Valtype val = elfcpp::Swap::readval(wv); - Valtype reloc = value >> right_shift; + if (overflow == CHECK_SIGNED) + value = static_cast(value) >> right_shift; + else + value = value >> right_shift; + Valtype reloc = value; val &= ~dst_mask; reloc &= dst_mask; elfcpp::Swap::writeval(wv, val | reloc); - return overflowed(value >> right_shift, overflow); + return overflowed(value, overflow); } // Do a simple RELA relocation, unaligned. @@ -1625,11 +2027,15 @@ private: typedef typename elfcpp::Swap_unaligned::Valtype Valtype; Valtype val = elfcpp::Swap::readval(view); - Valtype reloc = value >> right_shift; + if (overflow == CHECK_SIGNED) + value = static_cast(value) >> right_shift; + else + value = value >> right_shift; + Valtype reloc = value; val &= ~dst_mask; reloc &= dst_mask; elfcpp::Swap_unaligned::writeval(view, val | reloc); - return overflowed(value >> right_shift, overflow); + return overflowed(value, overflow); } public: @@ -1747,6 +2153,56 @@ public: elfcpp::Swap<32, big_endian>::writeval(wv, val); return overflowed<16>(value, overflow); } + + // R_PPC64_D34 + static inline Status + addr34(unsigned char *view, uint64_t value, Overflow_check overflow) + { + Status stat = This::template rela<32,18>(view, 16, 0x3ffff, + value, overflow); + This::rela<32,16>(view + 4, 0, 0xffff, value, CHECK_NONE); + return stat; + } + + // R_PPC64_D34_HI30 + static inline void + addr34_hi(unsigned char *view, uint64_t value) + { This::addr34(view, value >> 34, CHECK_NONE);} + + // R_PPC64_D34_HA30 + static inline void + addr34_ha(unsigned char *view, uint64_t value) + { This::addr34_hi(view, value + (1ULL << 33));} + + // R_PPC64_D28 + static inline Status + addr28(unsigned char *view, uint64_t value, Overflow_check overflow) + { + Status stat = This::template rela<32,12>(view, 16, 0xfff, + value, overflow); + This::rela<32,16>(view + 4, 0, 0xffff, value, CHECK_NONE); + return stat; + } + + // R_PPC64_ADDR16_HIGHER34 + static inline void + addr16_higher34(unsigned char* view, uint64_t value) + { This::addr16(view, value >> 34, CHECK_NONE); } + + // R_PPC64_ADDR16_HIGHERA34 + static inline void + addr16_highera34(unsigned char* view, uint64_t value) + { This::addr16_higher34(view, value + (1ULL << 33)); } + + // R_PPC64_ADDR16_HIGHEST34 + static inline void + addr16_highest34(unsigned char* view, uint64_t value) + { This::addr16(view, value >> 50, CHECK_NONE); } + + // R_PPC64_ADDR16_HIGHESTA34 + static inline void + addr16_highesta34(unsigned char* view, uint64_t value) + { This::addr16_highest34(view, value + (1ULL << 33)); } }; // Set ABI version for input and output. @@ -1772,8 +2228,8 @@ Powerpc_relobj::set_abiversion(int ver) } } -// Stash away the index of .got2 or .opd in a relocatable object, if -// such a section exists. +// Stash away the index of .got2, .opd, .rela.toc, and .toc in a +// relocatable object, if such sections exists. template bool @@ -1802,6 +2258,18 @@ Powerpc_relobj::do_find_special_sections( this->name().c_str(), this->abiversion()); } } + if (size == 64) + { + s = this->template find_shdr(pshdrs, ".rela.toc", + names, names_size, NULL); + if (s != NULL) + { + unsigned int ndx = (s - pshdrs) / elfcpp::Elf_sizes::shdr_size; + this->relatoc_ = ndx; + typename elfcpp::Shdr shdr(s); + this->toc_ = this->adjust_shndx(shdr.get_sh_info()); + } + } return Sized_relobj_file::do_find_special_sections(sd); } @@ -1816,10 +2284,8 @@ Powerpc_relobj::scan_opd_relocs( { if (size == 64) { - typedef typename Reloc_types::Reloc - Reltype; - const int reloc_size - = Reloc_types::reloc_size; + typedef typename elfcpp::Rela Reltype; + const int reloc_size = elfcpp::Elf_sizes::rela_size; const int sym_size = elfcpp::Elf_sizes::sym_size; Address expected_off = 0; bool regular = true; @@ -1884,6 +2350,79 @@ Powerpc_relobj::scan_opd_relocs( } } +// Returns true if a code sequence loading the TOC entry at VALUE +// relative to the TOC pointer can be converted into code calculating +// a TOC pointer relative offset. +// If so, the TOC pointer relative offset is stored to VALUE. + +template +bool +Powerpc_relobj::make_toc_relative( + Target_powerpc* target, + Address* value) +{ + if (size != 64) + return false; + + // With -mcmodel=medium code it is quite possible to have + // toc-relative relocs referring to objects outside the TOC. + // Don't try to look at a non-existent TOC. + if (this->toc_shndx() == 0) + return false; + + // Convert VALUE back to an address by adding got_base (see below), + // then to an offset in the TOC by subtracting the TOC output + // section address and the TOC output offset. Since this TOC output + // section and the got output section are one and the same, we can + // omit adding and subtracting the output section address. + Address off = (*value + this->toc_base_offset() + - this->output_section_offset(this->toc_shndx())); + // Is this offset in the TOC? -mcmodel=medium code may be using + // TOC relative access to variables outside the TOC. Those of + // course can't be optimized. We also don't try to optimize code + // that is using a different object's TOC. + if (off >= this->section_size(this->toc_shndx())) + return false; + + if (this->no_toc_opt(off)) + return false; + + section_size_type vlen; + unsigned char* view = this->get_output_view(this->toc_shndx(), &vlen); + Address addr = elfcpp::Swap::readval(view + off); + // The TOC pointer + Address got_base = (target->got_section()->output_section()->address() + + this->toc_base_offset()); + addr -= got_base; + if (addr + (uint64_t) 0x80008000 >= (uint64_t) 1 << 32) + return false; + + *value = addr; + return true; +} + +template +bool +Powerpc_relobj::make_got_relative( + Target_powerpc* target, + const Symbol_value* psymval, + Address addend, + Address* value) +{ + Address addr = psymval->value(this, addend); + Address got_base = (target->got_section()->output_section()->address() + + this->toc_base_offset()); + addr -= got_base; + if (addr + 0x80008000 > 0xffffffff) + return false; + + *value = addr; + return true; +} + +// Perform the Sized_relobj_file method, then set up opd info from +// .opd relocs. + template void Powerpc_relobj::do_read_relocs(Read_relocs_data* rd) @@ -1918,6 +2457,8 @@ void Powerpc_relobj::do_read_symbols(Read_symbols_data* sd) { this->base_read_symbols(sd); + if (this->input_file()->format() != Input_file::FORMAT_ELF) + return; if (size == 64) { const int shdr_size = elfcpp::Elf_sizes::shdr_size; @@ -1951,6 +2492,56 @@ Powerpc_relobj::do_read_symbols(Read_symbols_data* sd) } } } + + const size_t shdr_size = elfcpp::Elf_sizes::shdr_size; + const unsigned char* ps = sd->section_headers->data() + shdr_size; + bool merge_attributes = false; + for (unsigned int i = 1; i < this->shnum(); ++i, ps += shdr_size) + { + elfcpp::Shdr shdr(ps); + switch (shdr.get_sh_type()) + { + case elfcpp::SHT_GNU_ATTRIBUTES: + { + gold_assert(this->attributes_section_data_ == NULL); + section_offset_type section_offset = shdr.get_sh_offset(); + section_size_type section_size = + convert_to_section_size_type(shdr.get_sh_size()); + const unsigned char* view = + this->get_view(section_offset, section_size, true, false); + this->attributes_section_data_ = + new Attributes_section_data(view, section_size); + } + break; + + case elfcpp::SHT_SYMTAB: + { + // Sometimes an object has no contents except the section + // name string table and an empty symbol table with the + // undefined symbol. We don't want to merge + // processor-specific flags from such an object. + const typename elfcpp::Elf_types::Elf_WXword sym_size = + elfcpp::Elf_sizes::sym_size; + if (shdr.get_sh_size() > sym_size) + merge_attributes = true; + } + break; + + case elfcpp::SHT_STRTAB: + break; + + default: + merge_attributes = true; + break; + } + } + + if (!merge_attributes) + { + // Should rarely happen. + delete this->attributes_section_data_; + this->attributes_section_data_ = NULL; + } } template @@ -1982,9 +2573,26 @@ void Powerpc_dynobj::do_read_symbols(Read_symbols_data* sd) { this->base_read_symbols(sd); + const size_t shdr_size = elfcpp::Elf_sizes::shdr_size; + const unsigned char* ps = + sd->section_headers->data() + shdr_size * (this->shnum() - 1); + for (unsigned int i = this->shnum(); i > 0; --i, ps -= shdr_size) + { + elfcpp::Shdr shdr(ps); + if (shdr.get_sh_type() == elfcpp::SHT_GNU_ATTRIBUTES) + { + section_offset_type section_offset = shdr.get_sh_offset(); + section_size_type section_size = + convert_to_section_size_type(shdr.get_sh_size()); + const unsigned char* view = + this->get_view(section_offset, section_size, true, false); + this->attributes_section_data_ = + new Attributes_section_data(view, section_size); + break; + } + } if (size == 64) { - const int shdr_size = elfcpp::Elf_sizes::shdr_size; const unsigned char* const pshdrs = sd->section_headers->data(); const unsigned char* namesu = sd->section_names->data(); const char* names = reinterpret_cast(namesu); @@ -2079,11 +2687,65 @@ Powerpc_dynobj::do_read_symbols(Read_symbols_data* sd) } } -// Set up some symbols. +// Relocate sections. template void -Target_powerpc::do_define_standard_symbols( +Powerpc_relobj::do_relocate_sections( + const Symbol_table* symtab, const Layout* layout, + const unsigned char* pshdrs, Output_file* of, + typename Sized_relobj_file::Views* pviews) +{ + unsigned int start = 1; + if (size == 64 + && this->relatoc_ != 0 + && !parameters->options().relocatable()) + { + // Relocate .toc first. + this->relocate_section_range(symtab, layout, pshdrs, of, pviews, + this->relatoc_, this->relatoc_); + this->relocate_section_range(symtab, layout, pshdrs, of, pviews, + 1, this->relatoc_ - 1); + start = this->relatoc_ + 1; + } + this->relocate_section_range(symtab, layout, pshdrs, of, pviews, + start, this->shnum() - 1); + + if (!parameters->options().output_is_position_independent()) + { + Target_powerpc* target + = static_cast*>( + parameters->sized_target()); + if (target->lplt_section() && target->lplt_section()->data_size() != 0) + { + const section_size_type offset = target->lplt_section()->offset(); + const section_size_type oview_size + = convert_to_section_size_type(target->lplt_section()->data_size()); + unsigned char* const oview = of->get_output_view(offset, oview_size); + + bool modified = false; + unsigned int nsyms = this->local_symbol_count(); + for (unsigned int i = 0; i < nsyms; i++) + if (this->local_has_plt_offset(i)) + { + Address value = this->local_symbol_value(i, 0); + if (size == 64) + value += ppc64_local_entry_offset(i); + size_t off = this->local_plt_offset(i); + elfcpp::Swap::writeval(oview + off, value); + modified = true; + } + if (modified) + of->write_output_view(offset, oview_size, oview); + } + } +} + +// Set up some symbols. + +template +void +Target_powerpc::do_define_standard_symbols( Symbol_table* symtab, Layout* layout) { @@ -2147,6 +2809,36 @@ Target_powerpc::do_define_standard_symbols( false, false); } } + + this->tls_get_addr_ = symtab->lookup("__tls_get_addr"); + if (parameters->options().tls_get_addr_optimize() + && this->tls_get_addr_ != NULL + && this->tls_get_addr_->in_reg()) + this->tls_get_addr_opt_ = symtab->lookup("__tls_get_addr_opt"); + if (this->tls_get_addr_opt_ != NULL) + { + if (this->tls_get_addr_->is_undefined() + || this->tls_get_addr_->is_from_dynobj()) + { + // Make it seem as if references to __tls_get_addr are + // really to __tls_get_addr_opt, so the latter symbol is + // made dynamic, not the former. + this->tls_get_addr_->clear_in_reg(); + this->tls_get_addr_opt_->set_in_reg(); + } + // We have a non-dynamic definition for __tls_get_addr. + // Make __tls_get_addr_opt the same, if it does not already have + // a non-dynamic definition. + else if (this->tls_get_addr_opt_->is_undefined() + || this->tls_get_addr_opt_->is_from_dynobj()) + { + Sized_symbol* from + = static_cast*>(this->tls_get_addr_); + Sized_symbol* to + = static_cast*>(this->tls_get_addr_opt_); + symtab->clone(to, from); + } + } } // Set up PowerPC target specific relobj. @@ -2234,6 +2926,9 @@ public: Output_data_reloc_generic* rel_dyn, unsigned int r_type_1, unsigned int r_type_2) { + if (gsym->has_got_offset(got_type)) + return; + this->reserve_ent(2); Output_data_got:: add_global_pair_with_rel(gsym, got_type, rel_dyn, r_type_1, r_type_2); @@ -2265,6 +2960,9 @@ public: Output_data_reloc_generic* rel_dyn, unsigned int r_type) { + if (object->local_has_got_offset(sym_index, got_type)) + return; + this->reserve_ent(2); Output_data_got:: add_local_tls_pair(object, sym_index, got_type, rel_dyn, r_type); @@ -2669,7 +3367,8 @@ Target_powerpc::group_sections(Layout* layout, if ((*t)->owner->is_input_section()) stub_table = new Stub_table(this, (*t)->output_section, - (*t)->owner); + (*t)->owner, + this->stub_tables_.size()); else if ((*t)->owner->is_relaxed_input_section()) stub_table = static_cast*>( (*t)->owner->relaxed_input_section()); @@ -2680,6 +3379,7 @@ Target_powerpc::group_sections(Layout* layout, } } +template static unsigned long max_branch_delta (unsigned int r_type) { @@ -2688,12 +3388,47 @@ max_branch_delta (unsigned int r_type) || r_type == elfcpp::R_POWERPC_REL14_BRNTAKEN) return 1L << 15; if (r_type == elfcpp::R_POWERPC_REL24 + || (size == 64 && r_type == elfcpp::R_PPC64_REL24_NOTOC) || r_type == elfcpp::R_PPC_PLTREL24 || r_type == elfcpp::R_PPC_LOCAL24PC) return 1L << 25; return 0; } +// Return whether this branch is going via a plt call stub. + +template +bool +Target_powerpc::Branch_info::mark_pltcall( + Powerpc_relobj* ppc_object, + unsigned int shndx, + Address offset, + Target_powerpc* target, + Symbol_table* symtab) +{ + if (this->object_ != ppc_object + || this->shndx_ != shndx + || this->offset_ != offset) + return false; + + Symbol* sym = this->object_->global_symbol(this->r_sym_); + if (sym != NULL && sym->is_forwarder()) + sym = symtab->resolve_forwards(sym); + if (target->replace_tls_get_addr(sym)) + sym = target->tls_get_addr_opt(); + const Sized_symbol* gsym = static_cast*>(sym); + if (gsym != NULL + ? (gsym->use_plt_offset(Scan::get_reference_flags(this->r_type_, target)) + && !target->is_elfv2_localentry0(gsym)) + : (this->object_->local_has_plt_offset(this->r_sym_) + && !target->is_elfv2_localentry0(this->object_, this->r_sym_))) + { + this->tocsave_ = 1; + return true; + } + return false; +} + // If this branch needs a plt call stub, or a long branch stub, make one. template @@ -2704,12 +3439,14 @@ Target_powerpc::Branch_info::make_stub( Symbol_table* symtab) const { Symbol* sym = this->object_->global_symbol(this->r_sym_); - if (sym != NULL && sym->is_forwarder()) - sym = symtab->resolve_forwards(sym); - const Sized_symbol* gsym = static_cast*>(sym); Target_powerpc* target = static_cast*>( parameters->sized_target()); + if (sym != NULL && sym->is_forwarder()) + sym = symtab->resolve_forwards(sym); + if (target->replace_tls_get_addr(sym)) + sym = target->tls_get_addr_opt(); + const Sized_symbol* gsym = static_cast*>(sym); bool ok = true; if (gsym != NULL @@ -2720,15 +3457,21 @@ Target_powerpc::Branch_info::make_stub( && gsym != NULL && target->abiversion() >= 2 && !parameters->options().output_is_position_independent() - && !is_branch_reloc(this->r_type_)) + && !is_branch_reloc(this->r_type_)) target->glink_section()->add_global_entry(gsym); else { - if (stub_table == NULL) + if (stub_table == NULL + && !(size == 32 + && gsym != NULL + && !parameters->options().output_is_position_independent() + && !is_branch_reloc(this->r_type_))) stub_table = this->object_->stub_table(this->shndx_); if (stub_table == NULL) { - // This is a ref from a data section to an ifunc symbol. + // This is a ref from a data section to an ifunc symbol, + // or a non-branch reloc for which we always want to use + // one set of stubs for resolving function addresses. stub_table = ifunc_stub_table; } gold_assert(stub_table != NULL); @@ -2739,16 +3482,18 @@ Target_powerpc::Branch_info::make_stub( if (gsym != NULL) ok = stub_table->add_plt_call_entry(from, this->object_, gsym, - this->r_type_, this->addend_); + this->r_type_, this->addend_, + this->tocsave_); else ok = stub_table->add_plt_call_entry(from, this->object_, this->r_sym_, - this->r_type_, this->addend_); + this->r_type_, this->addend_, + this->tocsave_); } } else { - Address max_branch_offset = max_branch_delta(this->r_type_); + Address max_branch_offset = max_branch_delta(this->r_type_); if (max_branch_offset == 0) return true; Address from = this->object_->get_output_section_offset(this->shndx_); @@ -2816,7 +3561,12 @@ Target_powerpc::Branch_info::make_stub( return true; } Address delta = to - from; - if (delta + max_branch_offset >= 2 * max_branch_offset) + if (delta + max_branch_offset >= 2 * max_branch_offset + || (size == 64 + && this->r_type_ == elfcpp::R_PPC64_REL24_NOTOC + && (gsym != NULL + ? this->object_->ppc64_needs_toc(gsym) + : this->object_->ppc64_needs_toc(this->r_sym_)))) { if (stub_table == NULL) { @@ -2988,6 +3738,40 @@ Target_powerpc::do_relax(int pass, return true; } } + bool do_resize = false; + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + if ((*p)->need_resize()) + { + do_resize = true; + break; + } + if (do_resize) + { + this->branch_lookup_table_.clear(); + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + (*p)->set_resizing(true); + for (typename Branches::const_iterator b = this->branch_info_.begin(); + b != this->branch_info_.end(); + b++) + { + if (!b->make_stub(one_stub_table, ifunc_stub_table, symtab) + && !this->relax_failed_) + { + this->relax_failed_ = true; + this->relax_fail_count_++; + if (this->relax_fail_count_ < 3) + return true; + } + } + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + (*p)->set_resizing(false); + } // Did anything change size? unsigned int num_huge_branches = this->branch_lookup_table_.size(); @@ -2997,6 +3781,16 @@ Target_powerpc::do_relax(int pass, if (size == 64 && again) this->brlt_section_->set_current_size(num_huge_branches); + for (typename Stub_tables::reverse_iterator p = this->stub_tables_.rbegin(); + p != this->stub_tables_.rend(); + ++p) + (*p)->remove_eh_frame(layout); + + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + (*p)->add_eh_frame(layout); + typedef Unordered_set Output_sections; Output_sections os_need_update; for (typename Stub_tables::iterator p = this->stub_tables_.begin(); @@ -3006,7 +3800,6 @@ Target_powerpc::do_relax(int pass, if ((*p)->size_update()) { again = true; - (*p)->add_eh_frame(layout); os_need_update.insert((*p)->output_section()); } } @@ -3065,6 +3858,36 @@ Target_powerpc::do_relax(int pass, } this->brlt_section_->finalize_brlt_sizes(); } + + if (!again + && (parameters->options().user_set_emit_stub_syms() + ? parameters->options().emit_stub_syms() + : (size == 64 + || parameters->options().output_is_position_independent() + || parameters->options().emit_relocs()))) + { + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + (*p)->define_stub_syms(symtab); + + if (this->glink_ != NULL) + { + int stub_size = this->glink_->pltresolve_size(); + Address value = -stub_size; + if (size == 64) + { + value = 8; + stub_size -= 8; + } + this->define_local(symtab, "__glink_PLTresolve", + this->glink_, value, stub_size); + + if (size != 64) + this->define_local(symtab, "__glink", this->glink_, 0, 0); + } + } + return again; } @@ -3106,7 +3929,7 @@ Target_powerpc::do_plt_fde_location(const Output_data* plt, // There are two FDEs for a position independent glink. // The first covers the branch table, the second // __glink_PLTresolve at the end of glink. - off_t resolve_size = this->glink_->pltresolve_size; + off_t resolve_size = this->glink_->pltresolve_size(); if (oview[9] == elfcpp::DW_CFA_nop) len -= resolve_size; else @@ -3155,6 +3978,9 @@ class Output_data_plt_powerpc : public Output_section_data_build void add_ifunc_entry(Symbol*); + void + add_local_entry(Sized_relobj_file*, unsigned int); + void add_local_ifunc_entry(Sized_relobj_file*, unsigned int); @@ -3192,8 +4018,8 @@ class Output_data_plt_powerpc : public Output_section_data_build unsigned int first_plt_entry_offset() const { - // IPLT has no reserved entry. - if (this->name_[3] == 'I') + // IPLT and LPLT have no reserved entry. + if (this->name_[3] == 'I' || this->name_[3] == 'L') return 0; return this->targ_->first_plt_entry_offset(); } @@ -3256,6 +4082,31 @@ Output_data_plt_powerpc::add_ifunc_entry(Symbol* gsym) } } +// Add an entry for a local symbol to the PLT. + +template +void +Output_data_plt_powerpc::add_local_entry( + Sized_relobj_file* relobj, + unsigned int local_sym_index) +{ + if (!relobj->local_has_plt_offset(local_sym_index)) + { + section_size_type off = this->current_data_size(); + relobj->set_local_plt_offset(local_sym_index, off); + if (this->rel_) + { + unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; + if (size == 64 && this->targ_->abiversion() < 2) + dynrel = elfcpp::R_POWERPC_JMP_SLOT; + this->rel_->add_symbolless_local_addend(relobj, local_sym_index, + dynrel, this, off, 0); + } + off += this->plt_entry_size(); + this->set_current_data_size(off); + } +} + // Add an entry for a local ifunc symbol to the IPLT. template @@ -3283,14 +4134,18 @@ static const uint32_t add_2_2_11 = 0x7c425a14; static const uint32_t add_2_2_12 = 0x7c426214; static const uint32_t add_3_3_2 = 0x7c631214; static const uint32_t add_3_3_13 = 0x7c636a14; +static const uint32_t add_3_12_2 = 0x7c6c1214; +static const uint32_t add_3_12_13 = 0x7c6c6a14; static const uint32_t add_11_0_11 = 0x7d605a14; static const uint32_t add_11_2_11 = 0x7d625a14; static const uint32_t add_11_11_2 = 0x7d6b1214; +static const uint32_t add_12_11_12 = 0x7d8b6214; static const uint32_t addi_0_12 = 0x380c0000; static const uint32_t addi_2_2 = 0x38420000; static const uint32_t addi_3_3 = 0x38630000; static const uint32_t addi_11_11 = 0x396b0000; static const uint32_t addi_12_1 = 0x39810000; +static const uint32_t addi_12_11 = 0x398b0000; static const uint32_t addi_12_12 = 0x398c0000; static const uint32_t addis_0_2 = 0x3c020000; static const uint32_t addis_0_13 = 0x3c0d0000; @@ -3300,14 +4155,19 @@ static const uint32_t addis_11_11 = 0x3d6b0000; static const uint32_t addis_11_30 = 0x3d7e0000; static const uint32_t addis_12_1 = 0x3d810000; static const uint32_t addis_12_2 = 0x3d820000; +static const uint32_t addis_12_11 = 0x3d8b0000; static const uint32_t addis_12_12 = 0x3d8c0000; static const uint32_t b = 0x48000000; static const uint32_t bcl_20_31 = 0x429f0005; static const uint32_t bctr = 0x4e800420; +static const uint32_t bctrl = 0x4e800421; +static const uint32_t beqlr = 0x4d820020; static const uint32_t blr = 0x4e800020; static const uint32_t bnectr_p4 = 0x4ce20420; static const uint32_t cmpld_7_12_0 = 0x7fac0040; static const uint32_t cmpldi_2_0 = 0x28220000; +static const uint32_t cmpdi_11_0 = 0x2c2b0000; +static const uint32_t cmpwi_11_0 = 0x2c0b0000; static const uint32_t cror_15_15_15 = 0x4def7b82; static const uint32_t cror_31_31_31 = 0x4ffffb82; static const uint32_t ld_0_1 = 0xe8010000; @@ -3316,13 +4176,18 @@ static const uint32_t ld_2_1 = 0xe8410000; static const uint32_t ld_2_2 = 0xe8420000; static const uint32_t ld_2_11 = 0xe84b0000; static const uint32_t ld_2_12 = 0xe84c0000; +static const uint32_t ld_11_1 = 0xe9610000; static const uint32_t ld_11_2 = 0xe9620000; +static const uint32_t ld_11_3 = 0xe9630000; static const uint32_t ld_11_11 = 0xe96b0000; static const uint32_t ld_12_2 = 0xe9820000; +static const uint32_t ld_12_3 = 0xe9830000; static const uint32_t ld_12_11 = 0xe98b0000; static const uint32_t ld_12_12 = 0xe98c0000; +static const uint32_t ldx_12_11_12 = 0x7d8b602a; static const uint32_t lfd_0_1 = 0xc8010000; static const uint32_t li_0_0 = 0x38000000; +static const uint32_t li_11_0 = 0x39600000; static const uint32_t li_12_0 = 0x39800000; static const uint32_t lis_0 = 0x3c000000; static const uint32_t lis_2 = 0x3c400000; @@ -3330,24 +4195,35 @@ static const uint32_t lis_11 = 0x3d600000; static const uint32_t lis_12 = 0x3d800000; static const uint32_t lvx_0_12_0 = 0x7c0c00ce; static const uint32_t lwz_0_12 = 0x800c0000; +static const uint32_t lwz_11_3 = 0x81630000; static const uint32_t lwz_11_11 = 0x816b0000; static const uint32_t lwz_11_30 = 0x817e0000; +static const uint32_t lwz_12_3 = 0x81830000; static const uint32_t lwz_12_12 = 0x818c0000; static const uint32_t lwzu_0_12 = 0x840c0000; static const uint32_t mflr_0 = 0x7c0802a6; static const uint32_t mflr_11 = 0x7d6802a6; static const uint32_t mflr_12 = 0x7d8802a6; +static const uint32_t mr_0_3 = 0x7c601b78; +static const uint32_t mr_3_0 = 0x7c030378; static const uint32_t mtctr_0 = 0x7c0903a6; static const uint32_t mtctr_11 = 0x7d6903a6; static const uint32_t mtctr_12 = 0x7d8903a6; static const uint32_t mtlr_0 = 0x7c0803a6; +static const uint32_t mtlr_11 = 0x7d6803a6; static const uint32_t mtlr_12 = 0x7d8803a6; static const uint32_t nop = 0x60000000; static const uint32_t ori_0_0_0 = 0x60000000; +static const uint32_t ori_11_11_0 = 0x616b0000; +static const uint32_t ori_12_12_0 = 0x618c0000; +static const uint32_t oris_12_12_0 = 0x658c0000; +static const uint32_t sldi_11_11_34 = 0x796b1746; +static const uint32_t sldi_12_12_32 = 0x799c07c6; static const uint32_t srdi_0_0_2 = 0x7800f082; static const uint32_t std_0_1 = 0xf8010000; static const uint32_t std_0_12 = 0xf80c0000; static const uint32_t std_2_1 = 0xf8410000; +static const uint32_t std_11_1 = 0xf9610000; static const uint32_t stfd_0_1 = 0xd8010000; static const uint32_t stvx_0_12_0 = 0x7c0c01ce; static const uint32_t sub_11_11_12 = 0x7d6c5850; @@ -3355,13 +4231,17 @@ static const uint32_t sub_12_12_11 = 0x7d8b6050; static const uint32_t xor_2_12_12 = 0x7d826278; static const uint32_t xor_11_12_12 = 0x7d8b6278; +static const uint64_t paddi_12_pc = 0x0610000039800000ULL; +static const uint64_t pld_12_pc = 0x04100000e5800000ULL; +static const uint64_t pnop = 0x0700000000000000ULL; + // Write out the PLT. template void Output_data_plt_powerpc::do_write(Output_file* of) { - if (size == 32 && this->name_[3] != 'I') + if (size == 32 && (this->name_[3] != 'I' && this->name_[3] != 'L')) { const section_size_type offset = this->offset(); const section_size_type oview_size @@ -3423,6 +4303,9 @@ Target_powerpc::make_plt_section(Symbol_table* symtab, ? ORDER_SMALL_DATA : ORDER_SMALL_BSS), false); + + Output_section* rela_plt_os = plt_rel->output_section(); + rela_plt_os->set_info_section(this->plt_->output_section()); } } @@ -3436,13 +4319,50 @@ Target_powerpc::make_iplt_section(Symbol_table* symtab, if (this->iplt_ == NULL) { this->make_plt_section(symtab, layout); + this->make_lplt_section(layout); Reloc_section* iplt_rel = new Reloc_section(false); - this->rela_dyn_->output_section()->add_output_section_data(iplt_rel); + if (this->rela_dyn_->output_section()) + this->rela_dyn_->output_section()->add_output_section_data(iplt_rel); this->iplt_ = new Output_data_plt_powerpc(this, iplt_rel, "** IPLT"); - this->plt_->output_section()->add_output_section_data(this->iplt_); + if (this->plt_->output_section()) + this->plt_->output_section()->add_output_section_data(this->iplt_); + } +} + +// Create the LPLT section. + +template +void +Target_powerpc::make_lplt_section(Layout* layout) +{ + if (this->lplt_ == NULL) + { + Reloc_section* lplt_rel = NULL; + if (parameters->options().output_is_position_independent()) + { + lplt_rel = new Reloc_section(false); + this->rela_dyn_section(layout); + if (this->rela_dyn_->output_section()) + this->rela_dyn_->output_section() + ->add_output_section_data(lplt_rel); + } + this->lplt_ + = new Output_data_plt_powerpc(this, lplt_rel, + "** LPLT"); + this->make_brlt_section(layout); + if (this->brlt_section_ && this->brlt_section_->output_section()) + this->brlt_section_->output_section() + ->add_output_section_data(this->lplt_); + else + layout->add_output_section_data(".branch_lt", + elfcpp::SHT_PROGBITS, + elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE, + this->lplt_, + ORDER_RELRO, + true); } } @@ -3493,8 +4413,7 @@ class Output_data_brlt_powerpc : public Output_section_data_build os->set_section_offsets_need_adjustment(); if (this->rel_ != NULL) { - unsigned int reloc_size - = Reloc_types::reloc_size; + const unsigned int reloc_size = elfcpp::Elf_sizes::rela_size; this->rel_->reset_address_and_file_offset(); this->rel_->set_current_data_size(num_branches * reloc_size); this->rel_->finalize_data_size(); @@ -3537,27 +4456,26 @@ Target_powerpc::make_brlt_section(Layout* layout) bool is_pic = parameters->options().output_is_position_independent(); if (is_pic) { - // When PIC we can't fill in .branch_lt (like .plt it can be - // a bss style section) but must initialise at runtime via - // dynamic relocats. + // When PIC we can't fill in .branch_lt but must initialise at + // runtime via dynamic relocations. this->rela_dyn_section(layout); brlt_rel = new Reloc_section(false); - this->rela_dyn_->output_section()->add_output_section_data(brlt_rel); + if (this->rela_dyn_->output_section()) + this->rela_dyn_->output_section() + ->add_output_section_data(brlt_rel); } this->brlt_section_ = new Output_data_brlt_powerpc(this, brlt_rel); - if (this->plt_ && is_pic) + if (this->plt_ && is_pic && this->plt_->output_section()) this->plt_->output_section() ->add_output_section_data(this->brlt_section_); else layout->add_output_section_data(".branch_lt", - (is_pic ? elfcpp::SHT_NOBITS - : elfcpp::SHT_PROGBITS), + elfcpp::SHT_PROGBITS, elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE, this->brlt_section_, - (is_pic ? ORDER_SMALL_BSS - : ORDER_SMALL_DATA), - false); + ORDER_RELRO, + true); } } @@ -3597,6 +4515,18 @@ ha(uint32_t a) return hi(a + 0x8000); } +static inline uint64_t +d34(uint64_t v) +{ + return ((v & 0x3ffff0000ULL) << 16) | (v & 0xffff); +} + +static inline uint64_t +ha34(uint64_t v) +{ + return (v + (1ULL << 33)) >> 34; +} + template struct Eh_cie { @@ -3625,7 +4555,7 @@ static const unsigned char glink_eh_frame_fde_64v1[] = 0, // Augmentation size. elfcpp::DW_CFA_advance_loc + 1, elfcpp::DW_CFA_register, 65, 12, - elfcpp::DW_CFA_advance_loc + 4, + elfcpp::DW_CFA_advance_loc + 5, elfcpp::DW_CFA_restore_extended, 65 }; @@ -3637,7 +4567,7 @@ static const unsigned char glink_eh_frame_fde_64v2[] = 0, // Augmentation size. elfcpp::DW_CFA_advance_loc + 1, elfcpp::DW_CFA_register, 65, 0, - elfcpp::DW_CFA_advance_loc + 4, + elfcpp::DW_CFA_advance_loc + 7, elfcpp::DW_CFA_restore_extended, 65 }; @@ -3670,6 +4600,15 @@ write_insn(unsigned char* p, uint32_t v) elfcpp::Swap<32, big_endian>::writeval(p, v); } +template +static inline unsigned int +param_plt_align() +{ + if (!parameters->options().user_set_plt_align()) + return size == 64 ? 32 : 8; + return 1 << parameters->options().plt_align(); +} + // Stub_table holds information about plt and long branch stubs. // Stubs are built in an area following some input section determined // by group_sections(). This input section is converted to a relaxed @@ -3679,12 +4618,37 @@ template class Stub_table : public Output_relaxed_input_section { public: + struct Plt_stub_ent + { + Plt_stub_ent(unsigned int off, unsigned int indx) + : off_(off), indx_(indx), iter_(0), notoc_(0), r2save_(0), localentry0_(0) + { } + + unsigned int off_; + unsigned int indx_ : 28; + unsigned int iter_ : 1; + unsigned int notoc_ : 1; + unsigned int r2save_ : 1; + unsigned int localentry0_ : 1; + }; + struct Branch_stub_ent + { + Branch_stub_ent(unsigned int off, bool notoc, bool save_res) + : off_(off), iter_(false), notoc_(notoc), save_res_(save_res) + { } + + unsigned int off_; + bool iter_; + bool notoc_; + bool save_res_; + }; typedef typename elfcpp::Elf_types::Elf_Addr Address; static const Address invalid_address = static_cast
(0) - 1; Stub_table(Target_powerpc* targ, Output_section* output_section, - const Output_section::Input_section* owner) + const Output_section::Input_section* owner, + uint32_t id) : Output_relaxed_input_section(owner->relobj(), owner->shndx(), owner->relobj() ->section_addralign(owner->shndx())), @@ -3692,7 +4656,8 @@ class Stub_table : public Output_relaxed_input_section orig_data_size_(owner->current_data_size()), plt_size_(0), last_plt_size_(0), branch_size_(0), last_branch_size_(0), min_size_threshold_(0), - eh_frame_added_(false), need_save_res_(false) + need_save_res_(false), need_resize_(false), resizing_(false), + uniq_(id) { this->set_output_section(output_section); @@ -3707,30 +4672,32 @@ class Stub_table : public Output_relaxed_input_section const Sized_relobj_file*, const Symbol*, unsigned int, - Address); + Address, + bool); bool add_plt_call_entry(Address, const Sized_relobj_file*, unsigned int, unsigned int, - Address); + Address, + bool); // Find a given plt call stub. - Address + const Plt_stub_ent* find_plt_call_entry(const Symbol*) const; - Address + const Plt_stub_ent* find_plt_call_entry(const Sized_relobj_file*, unsigned int) const; - Address + const Plt_stub_ent* find_plt_call_entry(const Sized_relobj_file*, const Symbol*, unsigned int, Address) const; - Address + const Plt_stub_ent* find_plt_call_entry(const Sized_relobj_file*, unsigned int, unsigned int, @@ -3741,14 +4708,14 @@ class Stub_table : public Output_relaxed_input_section add_long_branch_entry(const Powerpc_relobj*, unsigned int, Address, Address, bool); - Address + const Branch_stub_ent* find_long_branch_entry(const Powerpc_relobj*, Address) const; bool can_reach_stub(Address from, unsigned int off, unsigned int r_type) { - Address max_branch_offset = max_branch_delta(r_type); + Address max_branch_offset = max_branch_delta(r_type); if (max_branch_offset == 0) return true; gold_assert(from != invalid_address); @@ -3771,6 +4738,23 @@ class Stub_table : public Output_relaxed_input_section } } + bool + need_resize() const + { return need_resize_; } + + void + set_resizing(bool val) + { + this->resizing_ = val; + if (val) + { + this->need_resize_ = false; + this->plt_size_ = 0; + this->branch_size_ = 0; + this->need_save_res_ = false; + } + } + Address set_address_and_size(const Output_section* os, Address off) { @@ -3813,9 +4797,17 @@ class Stub_table : public Output_relaxed_input_section plt_size() const { return this->plt_size_; } - void set_min_size_threshold(Address min_size) + section_size_type + branch_size() const + { return this->branch_size_; } + + void + set_min_size_threshold(Address min_size) { this->min_size_threshold_ = min_size; } + void + define_stub_syms(Symbol_table*); + bool size_update() { @@ -3847,141 +4839,98 @@ class Stub_table : public Output_relaxed_input_section return false; } - // Add .eh_frame info for this stub section. Unlike other linker - // generated .eh_frame this is added late in the link, because we - // only want the .eh_frame info if this particular stub section is - // non-empty. + // Add .eh_frame info for this stub section. void - add_eh_frame(Layout* layout) - { - if (!this->eh_frame_added_) - { - if (!parameters->options().ld_generated_unwind_info()) - return; - - // Since we add stub .eh_frame info late, it must be placed - // after all other linker generated .eh_frame info so that - // merge mapping need not be updated for input sections. - // There is no provision to use a different CIE to that used - // by .glink. - if (!this->targ_->has_glink()) - return; + add_eh_frame(Layout* layout); - layout->add_eh_frame_for_plt(this, - Eh_cie::eh_frame_cie, - sizeof (Eh_cie::eh_frame_cie), - default_fde, - sizeof (default_fde)); - this->eh_frame_added_ = true; - } - } + // Remove .eh_frame info for this stub section. + void + remove_eh_frame(Layout* layout); Target_powerpc* targ() const { return targ_; } private: - class Plt_stub_ent; - class Plt_stub_ent_hash; - typedef Unordered_map Plt_stub_entries; + class Plt_stub_key; + class Plt_stub_key_hash; + typedef Unordered_map Plt_stub_entries; + class Branch_stub_key; + class Branch_stub_key_hash; + typedef Unordered_map Branch_stub_entries; // Alignment of stub section. unsigned int stub_align() const { - if (size == 32) - return 16; - unsigned int min_align = 32; + unsigned int min_align = size == 64 ? 32 : 16; unsigned int user_align = 1 << parameters->options().plt_align(); return std::max(user_align, min_align); } // Return the plt offset for the given call stub. Address - plt_off(typename Plt_stub_entries::const_iterator p, bool* is_iplt) const + plt_off(typename Plt_stub_entries::const_iterator p, + const Output_data_plt_powerpc** sec) const { const Symbol* gsym = p->first.sym_; if (gsym != NULL) - { - *is_iplt = (gsym->type() == elfcpp::STT_GNU_IFUNC - && gsym->can_use_relative_reloc(false)); - return gsym->plt_offset(); - } + return this->targ_->plt_off(gsym, sec); else { - *is_iplt = true; const Sized_relobj_file* relobj = p->first.object_; unsigned int local_sym_index = p->first.locsym_; - return relobj->local_plt_offset(local_sym_index); + return this->targ_->plt_off(relobj, local_sym_index, sec); } } // Size of a given plt call stub. unsigned int - plt_call_size(typename Plt_stub_entries::const_iterator p) const - { - if (size == 32) - return 16; + plt_call_size(typename Plt_stub_entries::const_iterator p) const; - bool is_iplt; - Address plt_addr = this->plt_off(p, &is_iplt); - if (is_iplt) - plt_addr += this->targ_->iplt_section()->address(); - else - plt_addr += this->targ_->plt_section()->address(); - Address got_addr = this->targ_->got_section()->output_section()->address(); - const Powerpc_relobj* ppcobj = static_cast - *>(p->first.object_); - got_addr += ppcobj->toc_base_offset(); - Address off = plt_addr - got_addr; - unsigned int bytes = 4 * 4 + 4 * (ha(off) != 0); - if (this->targ_->abiversion() < 2) - { - bool static_chain = parameters->options().plt_static_chain(); - bool thread_safe = this->targ_->plt_thread_safe(); - bytes += (4 - + 4 * static_chain - + 8 * thread_safe - + 4 * (ha(off + 8 + 8 * static_chain) != ha(off))); - } - unsigned int align = 1 << parameters->options().plt_align(); - if (align > 1) - bytes = (bytes + align - 1) & -align; - return bytes; + unsigned int + plt_call_align(unsigned int bytes) const + { + unsigned int align = param_plt_align(); + return (bytes + align - 1) & -align; } // Return long branch stub size. unsigned int - branch_stub_size(Address to) - { - Address loc - = this->stub_address() + this->last_plt_size_ + this->branch_size_; - if (to - loc + (1 << 25) < 2 << 25) - return 4; - if (size == 64 || !parameters->options().output_is_position_independent()) - return 16; - return 32; - } + branch_stub_size(typename Branch_stub_entries::const_iterator p, + bool* need_lt); + + bool + build_tls_opt_head(unsigned char** pp, + typename Plt_stub_entries::const_iterator cs); + + bool + build_tls_opt_tail(unsigned char* p, + typename Plt_stub_entries::const_iterator cs); + + void + plt_error(const Plt_stub_key& p); // Write out stubs. void do_write(Output_file*); // Plt call stub keys. - class Plt_stub_ent + class Plt_stub_key { public: - Plt_stub_ent(const Symbol* sym) + Plt_stub_key(const Symbol* sym) : sym_(sym), object_(0), addend_(0), locsym_(0) { } - Plt_stub_ent(const Sized_relobj_file* object, + Plt_stub_key(const Sized_relobj_file* object, unsigned int locsym_index) : sym_(NULL), object_(object), addend_(0), locsym_(locsym_index) { } - Plt_stub_ent(const Sized_relobj_file* object, + Plt_stub_key(const Sized_relobj_file* object, const Symbol* sym, unsigned int r_type, Address addend) @@ -3990,7 +4939,8 @@ class Stub_table : public Output_relaxed_input_section if (size != 32) this->addend_ = addend; else if (parameters->options().output_is_position_independent() - && r_type == elfcpp::R_PPC_PLTREL24) + && (r_type == elfcpp::R_PPC_PLTREL24 + || r_type == elfcpp::R_POWERPC_PLTCALL)) { this->addend_ = addend; if (this->addend_ >= 32768) @@ -3998,7 +4948,7 @@ class Stub_table : public Output_relaxed_input_section } } - Plt_stub_ent(const Sized_relobj_file* object, + Plt_stub_key(const Sized_relobj_file* object, unsigned int locsym_index, unsigned int r_type, Address addend) @@ -4007,11 +4957,12 @@ class Stub_table : public Output_relaxed_input_section if (size != 32) this->addend_ = addend; else if (parameters->options().output_is_position_independent() - && r_type == elfcpp::R_PPC_PLTREL24) + && (r_type == elfcpp::R_PPC_PLTREL24 + || r_type == elfcpp::R_POWERPC_PLTCALL)) this->addend_ = addend; } - bool operator==(const Plt_stub_ent& that) const + bool operator==(const Plt_stub_key& that) const { return (this->sym_ == that.sym_ && this->object_ == that.object_ @@ -4025,10 +4976,10 @@ class Stub_table : public Output_relaxed_input_section unsigned int locsym_; }; - class Plt_stub_ent_hash + class Plt_stub_key_hash { public: - size_t operator()(const Plt_stub_ent& ent) const + size_t operator()(const Plt_stub_key& ent) const { return (reinterpret_cast(ent.sym_) ^ reinterpret_cast(ent.object_) @@ -4038,18 +4989,17 @@ class Stub_table : public Output_relaxed_input_section }; // Long branch stub keys. - class Branch_stub_ent + class Branch_stub_key { public: - Branch_stub_ent(const Powerpc_relobj* obj, - Address to, bool save_res) - : dest_(to), toc_base_off_(0), save_res_(save_res) + Branch_stub_key(const Powerpc_relobj* obj, Address to) + : dest_(to), toc_base_off_(0) { if (size == 64) toc_base_off_ = obj->toc_base_offset(); } - bool operator==(const Branch_stub_ent& that) const + bool operator==(const Branch_stub_key& that) const { return (this->dest_ == that.dest_ && (size == 32 @@ -4058,14 +5008,13 @@ class Stub_table : public Output_relaxed_input_section Address dest_; unsigned int toc_base_off_; - bool save_res_; }; - class Branch_stub_ent_hash + class Branch_stub_key_hash { public: - size_t operator()(const Branch_stub_ent& ent) const - { return ent.dest_ ^ ent.toc_base_off_; } + size_t operator()(const Branch_stub_key& key) const + { return key.dest_ ^ key.toc_base_off_; } }; // In a sane world this would be a global. @@ -4073,8 +5022,6 @@ class Stub_table : public Output_relaxed_input_section // Map sym/object/addend to stub offset. Plt_stub_entries plt_call_stubs_; // Map destination address to stub offset. - typedef Unordered_map Branch_stub_entries; Branch_stub_entries long_branch_stubs_; // size of input section section_size_type orig_data_size_; @@ -4087,11 +5034,15 @@ class Stub_table : public Output_relaxed_input_section // a stub table, it is zero for the first few iterations, then // increases monotonically. Address min_size_threshold_; - // Whether .eh_frame info has been created for this stub section. - bool eh_frame_added_; // Set if this stub group needs a copy of out-of-line register // save/restore functions. bool need_save_res_; + // Set when notoc_/r2save_ changes after sizing a stub + bool need_resize_; + // Set when resizing stubs + bool resizing_; + // Per stub table unique identifier. + uint32_t uniq_; }; // Add a plt call stub, if we do not already have one for this @@ -4104,15 +5055,48 @@ Stub_table::add_plt_call_entry( const Sized_relobj_file* object, const Symbol* gsym, unsigned int r_type, - Address addend) + Address addend, + bool tocsave) { - Plt_stub_ent ent(object, gsym, r_type, addend); - unsigned int off = this->plt_size_; + Plt_stub_key key(object, gsym, r_type, addend); + Plt_stub_ent ent(this->plt_size_, this->plt_call_stubs_.size()); std::pair p - = this->plt_call_stubs_.insert(std::make_pair(ent, off)); - if (p.second) - this->plt_size_ = off + this->plt_call_size(p.first); - return this->can_reach_stub(from, off, r_type); + = this->plt_call_stubs_.insert(std::make_pair(key, ent)); + if (size == 64) + { + if (p.second + && this->targ_->is_elfv2_localentry0(gsym)) + { + p.first->second.localentry0_ = 1; + this->targ_->set_has_localentry0(); + } + if (r_type == elfcpp::R_PPC64_REL24_NOTOC) + { + if (!p.second && !p.first->second.notoc_ + && !this->targ_->powerxx_stubs()) + this->need_resize_ = true; + p.first->second.notoc_ = 1; + } + else if (!tocsave && !p.first->second.localentry0_) + { + if (!p.second && !p.first->second.r2save_) + this->need_resize_ = true; + p.first->second.r2save_ = 1; + } + } + if (p.second || (this->resizing_ && !p.first->second.iter_)) + { + if (this->resizing_) + { + p.first->second.iter_ = 1; + p.first->second.off_ = this->plt_size_; + } + this->plt_size_ += this->plt_call_size(p.first); + if (this->targ_->is_tls_get_addr_opt(gsym)) + this->targ_->set_has_tls_get_addr_opt(); + this->plt_size_ = this->plt_call_align(this->plt_size_); + } + return this->can_reach_stub(from, p.first->second.off_, r_type); } template @@ -4122,63 +5106,102 @@ Stub_table::add_plt_call_entry( const Sized_relobj_file* object, unsigned int locsym_index, unsigned int r_type, - Address addend) + Address addend, + bool tocsave) { - Plt_stub_ent ent(object, locsym_index, r_type, addend); - unsigned int off = this->plt_size_; + Plt_stub_key key(object, locsym_index, r_type, addend); + Plt_stub_ent ent(this->plt_size_, this->plt_call_stubs_.size()); std::pair p - = this->plt_call_stubs_.insert(std::make_pair(ent, off)); - if (p.second) - this->plt_size_ = off + this->plt_call_size(p.first); - return this->can_reach_stub(from, off, r_type); + = this->plt_call_stubs_.insert(std::make_pair(key, ent)); + if (size == 64) + { + if (p.second + && this->targ_->is_elfv2_localentry0(object, locsym_index)) + { + p.first->second.localentry0_ = 1; + this->targ_->set_has_localentry0(); + } + if (r_type == elfcpp::R_PPC64_REL24_NOTOC) + { + if (!p.second && !p.first->second.notoc_ + && !this->targ_->powerxx_stubs()) + this->need_resize_ = true; + p.first->second.notoc_ = 1; + } + else if (!tocsave && !p.first->second.localentry0_) + { + if (!p.second && !p.first->second.r2save_) + this->need_resize_ = true; + p.first->second.r2save_ = 1; + } + } + if (p.second || (this->resizing_ && !p.first->second.iter_)) + { + if (this->resizing_) + { + p.first->second.iter_ = 1; + p.first->second.off_ = this->plt_size_; + } + this->plt_size_ += this->plt_call_size(p.first); + this->plt_size_ = this->plt_call_align(this->plt_size_); + } + return this->can_reach_stub(from, p.first->second.off_, r_type); } // Find a plt call stub. template -typename Stub_table::Address +const typename Stub_table::Plt_stub_ent* Stub_table::find_plt_call_entry( const Sized_relobj_file* object, const Symbol* gsym, unsigned int r_type, Address addend) const { - Plt_stub_ent ent(object, gsym, r_type, addend); - typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(ent); - return p == this->plt_call_stubs_.end() ? invalid_address : p->second; + Plt_stub_key key(object, gsym, r_type, addend); + typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(key); + if (p == this->plt_call_stubs_.end()) + return NULL; + return &p->second; } template -typename Stub_table::Address +const typename Stub_table::Plt_stub_ent* Stub_table::find_plt_call_entry(const Symbol* gsym) const { - Plt_stub_ent ent(gsym); - typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(ent); - return p == this->plt_call_stubs_.end() ? invalid_address : p->second; + Plt_stub_key key(gsym); + typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(key); + if (p == this->plt_call_stubs_.end()) + return NULL; + return &p->second; } template -typename Stub_table::Address +const typename Stub_table::Plt_stub_ent* Stub_table::find_plt_call_entry( const Sized_relobj_file* object, unsigned int locsym_index, unsigned int r_type, Address addend) const { - Plt_stub_ent ent(object, locsym_index, r_type, addend); - typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(ent); - return p == this->plt_call_stubs_.end() ? invalid_address : p->second; + Plt_stub_key key(object, locsym_index, r_type, addend); + typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(key); + if (p == this->plt_call_stubs_.end()) + return NULL; + return &p->second; } template -typename Stub_table::Address +const typename Stub_table::Plt_stub_ent* Stub_table::find_plt_call_entry( const Sized_relobj_file* object, unsigned int locsym_index) const { - Plt_stub_ent ent(object, locsym_index); - typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(ent); - return p == this->plt_call_stubs_.end() ? invalid_address : p->second; + Plt_stub_key key(object, locsym_index); + typename Plt_stub_entries::const_iterator p = this->plt_call_stubs_.find(key); + if (p == this->plt_call_stubs_.end()) + return NULL; + return &p->second; } // Add a long branch stub if we don't already have one to given @@ -4193,50 +5216,231 @@ Stub_table::add_long_branch_entry( Address to, bool save_res) { - Branch_stub_ent ent(object, to, save_res); - Address off = this->branch_size_; - if (this->long_branch_stubs_.insert(std::make_pair(ent, off)).second) + Branch_stub_key key(object, to); + bool notoc = (size == 64 && r_type == elfcpp::R_PPC64_REL24_NOTOC); + Branch_stub_ent ent(this->branch_size_, notoc, save_res); + std::pair p + = this->long_branch_stubs_.insert(std::make_pair(key, ent)); + if (notoc && !p.first->second.notoc_) { + this->need_resize_ = true; + p.first->second.notoc_ = true; + } + gold_assert(save_res == p.first->second.save_res_); + if (p.second || (this->resizing_ && !p.first->second.iter_)) + { + if (this->resizing_) + { + p.first->second.iter_ = 1; + p.first->second.off_ = this->branch_size_; + } if (save_res) this->need_save_res_ = true; else { - unsigned int stub_size = this->branch_stub_size(to); - this->branch_size_ = off + stub_size; - if (size == 64 && stub_size != 4) + bool need_lt = false; + unsigned int stub_size = this->branch_stub_size(p.first, &need_lt); + this->branch_size_ += stub_size; + if (size == 64 && need_lt) this->targ_->add_branch_lookup_table(to); } } - return this->can_reach_stub(from, off, r_type); + return this->can_reach_stub(from, p.first->second.off_, r_type); } // Find long branch stub offset. template -typename Stub_table::Address +const typename Stub_table::Branch_stub_ent* Stub_table::find_long_branch_entry( const Powerpc_relobj* object, Address to) const { - Branch_stub_ent ent(object, to, false); + Branch_stub_key key(object, to); typename Branch_stub_entries::const_iterator p - = this->long_branch_stubs_.find(ent); + = this->long_branch_stubs_.find(key); if (p == this->long_branch_stubs_.end()) - return invalid_address; - if (p->first.save_res_) - return to - this->targ_->savres_section()->address() + this->branch_size_; - return p->second; + return NULL; + return &p->second; } -// A class to handle .glink. +template +static void +eh_advance (std::vector& fde, unsigned int delta) +{ + delta /= 4; + if (delta < 64) + fde.push_back(elfcpp::DW_CFA_advance_loc + delta); + else if (delta < 256) + { + fde.push_back(elfcpp::DW_CFA_advance_loc1); + fde.push_back(delta); + } + else if (delta < 65536) + { + fde.resize(fde.size() + 3); + unsigned char *p = &*fde.end() - 3; + *p++ = elfcpp::DW_CFA_advance_loc2; + elfcpp::Swap<16, big_endian>::writeval(p, delta); + } + else + { + fde.resize(fde.size() + 5); + unsigned char *p = &*fde.end() - 5; + *p++ = elfcpp::DW_CFA_advance_loc4; + elfcpp::Swap<32, big_endian>::writeval(p, delta); + } +} -template -class Output_data_glink : public Output_section_data +template +static bool +stub_sort(T s1, T s2) { - public: + return s1->second.off_ < s2->second.off_; +} + +// Add .eh_frame info for this stub section. Unlike other linker +// generated .eh_frame this is added late in the link, because we +// only want the .eh_frame info if this particular stub section is +// non-empty. + +template +void +Stub_table::add_eh_frame(Layout* layout) +{ + if (size != 64 + || !parameters->options().ld_generated_unwind_info()) + return; + + // Since we add stub .eh_frame info late, it must be placed + // after all other linker generated .eh_frame info so that + // merge mapping need not be updated for input sections. + // There is no provision to use a different CIE to that used + // by .glink. + if (!this->targ_->has_glink()) + return; + + typedef typename Plt_stub_entries::const_iterator plt_iter; + std::vector calls; + if (!this->plt_call_stubs_.empty()) + for (plt_iter cs = this->plt_call_stubs_.begin(); + cs != this->plt_call_stubs_.end(); + ++cs) + if ((this->targ_->is_tls_get_addr_opt(cs->first.sym_) + && cs->second.r2save_ + && !cs->second.localentry0_) + || (cs->second.notoc_ + && !this->targ_->powerxx_stubs())) + calls.push_back(cs); + if (calls.size() > 1) + std::stable_sort(calls.begin(), calls.end(), + stub_sort); + + typedef typename Branch_stub_entries::const_iterator branch_iter; + std::vector branches; + if (!this->long_branch_stubs_.empty() + && !this->targ_->powerxx_stubs()) + for (branch_iter bs = this->long_branch_stubs_.begin(); + bs != this->long_branch_stubs_.end(); + ++bs) + if (bs->second.notoc_) + branches.push_back(bs); + if (branches.size() > 1) + std::stable_sort(branches.begin(), branches.end(), + stub_sort); + + if (calls.empty() && branches.empty()) + return; + + unsigned int last_eh_loc = 0; + // offset pcrel sdata4, size udata4, and augmentation size byte. + std::vector fde(9, 0); + + for (unsigned int i = 0; i < calls.size(); i++) + { + plt_iter cs = calls[i]; + unsigned int off = cs->second.off_; + // The __tls_get_addr_opt call stub needs to describe where + // it saves LR, to support exceptions that might be thrown + // from __tls_get_addr, and to support asynchronous exceptions. + if (this->targ_->is_tls_get_addr_opt(cs->first.sym_)) + { + off += 7 * 4; + if (cs->second.r2save_ + && !cs->second.localentry0_) + { + off += 2 * 4; + eh_advance(fde, off - last_eh_loc); + fde.resize(fde.size() + 6); + unsigned char* p = &*fde.end() - 6; + *p++ = elfcpp::DW_CFA_offset_extended_sf; + *p++ = 65; + *p++ = -(this->targ_->stk_linker() / 8) & 0x7f; + unsigned int delta = this->plt_call_size(cs) - 4 - 9 * 4; + *p++ = elfcpp::DW_CFA_advance_loc + delta / 4; + *p++ = elfcpp::DW_CFA_restore_extended; + *p++ = 65; + last_eh_loc = off + delta; + continue; + } + } + // notoc stubs also should describe LR changes, to support + // asynchronous exceptions. + off += (cs->second.r2save_ ? 4 : 0) + 8; + eh_advance(fde, off - last_eh_loc); + fde.resize(fde.size() + 6); + unsigned char* p = &*fde.end() - 6; + *p++ = elfcpp::DW_CFA_register; + *p++ = 65; + *p++ = 12; + *p++ = elfcpp::DW_CFA_advance_loc + 8 / 4; + *p++ = elfcpp::DW_CFA_restore_extended; + *p++ = 65; + last_eh_loc = off + 8; + } + + for (unsigned int i = 0; i < branches.size(); i++) + { + branch_iter bs = branches[i]; + unsigned int off = bs->second.off_ + 8; + eh_advance(fde, off - last_eh_loc); + fde.resize(fde.size() + 6); + unsigned char* p = &*fde.end() - 6; + *p++ = elfcpp::DW_CFA_register; + *p++ = 65; + *p++ = 12; + *p++ = elfcpp::DW_CFA_advance_loc + 8 / 4; + *p++ = elfcpp::DW_CFA_restore_extended; + *p++ = 65; + last_eh_loc = off + 8; + } + + layout->add_eh_frame_for_plt(this, + Eh_cie::eh_frame_cie, + sizeof (Eh_cie::eh_frame_cie), + &*fde.begin(), fde.size()); +} + +template +void +Stub_table::remove_eh_frame(Layout* layout) +{ + if (size == 64 + && parameters->options().ld_generated_unwind_info() + && this->targ_->has_glink()) + layout->remove_eh_frame_for_plt(this, + Eh_cie::eh_frame_cie, + sizeof (Eh_cie::eh_frame_cie)); +} + +// A class to handle .glink. + +template +class Output_data_glink : public Output_section_data +{ + public: typedef typename elfcpp::Elf_types::Elf_Addr Address; static const Address invalid_address = static_cast
(0) - 1; - static const int pltresolve_size = 16*4; Output_data_glink(Target_powerpc* targ) : Output_section_data(16), targ_(targ), global_entry_stubs_(), @@ -4252,12 +5456,33 @@ class Output_data_glink : public Output_section_data Address find_global_entry(const Symbol*) const; + unsigned int + global_entry_align(unsigned int off) const + { + unsigned int align = param_plt_align(); + return (off + align - 1) & -align; + } + + unsigned int + global_entry_off() const + { + return this->global_entry_align(this->end_branch_table_); + } + Address global_entry_address() const { gold_assert(this->is_data_size_valid()); - unsigned int global_entry_off = (this->end_branch_table_ + 15) & -16; - return this->address() + global_entry_off; + return this->address() + this->global_entry_off(); + } + + int + pltresolve_size() const + { + if (size == 64) + return (8 + + (this->targ_->abiversion() < 2 ? 11 * 4 : 14 * 4)); + return 16 * 4; } protected: @@ -4329,10 +5554,11 @@ template void Output_data_glink::add_global_entry(const Symbol* gsym) { + unsigned int off = this->global_entry_align(this->ge_size_); std::pair p - = this->global_entry_stubs_.insert(std::make_pair(gsym, this->ge_size_)); + = this->global_entry_stubs_.insert(std::make_pair(gsym, off)); if (p.second) - this->ge_size_ += 16; + this->ge_size_ = off + 16; } template @@ -4359,11 +5585,11 @@ Output_data_glink::set_final_data_size() total += 4 * (count - 1); total += -total & 15; - total += this->pltresolve_size; + total += this->pltresolve_size(); } else { - total += this->pltresolve_size; + total += this->pltresolve_size(); // space for branch table total += 4 * count; @@ -4376,12 +5602,502 @@ Output_data_glink::set_final_data_size() } } this->end_branch_table_ = total; - total = (total + 15) & -16; + total = this->global_entry_align(total); total += this->ge_size_; this->set_data_size(total); } +// Define symbols on stubs, identifying the stub. + +template +void +Stub_table::define_stub_syms(Symbol_table* symtab) +{ + if (!this->plt_call_stubs_.empty()) + { + // The key for the plt call stub hash table includes addresses, + // therefore traversal order depends on those addresses, which + // can change between runs if gold is a PIE. Unfortunately the + // output .symtab ordering depends on the order in which symbols + // are added to the linker symtab. We want reproducible output + // so must sort the call stub symbols. + typedef typename Plt_stub_entries::const_iterator plt_iter; + std::vector sorted; + sorted.resize(this->plt_call_stubs_.size()); + + for (plt_iter cs = this->plt_call_stubs_.begin(); + cs != this->plt_call_stubs_.end(); + ++cs) + sorted[cs->second.indx_] = cs; + + for (unsigned int i = 0; i < this->plt_call_stubs_.size(); ++i) + { + plt_iter cs = sorted[i]; + char add[10]; + add[0] = 0; + if (cs->first.addend_ != 0) + sprintf(add, "+%x", static_cast(cs->first.addend_)); + char obj[10]; + obj[0] = 0; + if (cs->first.object_) + { + const Powerpc_relobj* ppcobj = static_cast + *>(cs->first.object_); + sprintf(obj, "%x:", ppcobj->uniq()); + } + char localname[9]; + const char *symname; + if (cs->first.sym_ == NULL) + { + sprintf(localname, "%x", cs->first.locsym_); + symname = localname; + } + else if (this->targ_->is_tls_get_addr_opt(cs->first.sym_)) + symname = this->targ_->tls_get_addr_opt()->name(); + else + symname = cs->first.sym_->name(); + char* name = new char[8 + 10 + strlen(obj) + strlen(symname) + strlen(add) + 1]; + sprintf(name, "%08x.plt_call.%s%s%s", this->uniq_, obj, symname, add); + Address value + = this->stub_address() - this->address() + cs->second.off_; + unsigned int stub_size = this->plt_call_align(this->plt_call_size(cs)); + this->targ_->define_local(symtab, name, this, value, stub_size); + } + } + + typedef typename Branch_stub_entries::const_iterator branch_iter; + for (branch_iter bs = this->long_branch_stubs_.begin(); + bs != this->long_branch_stubs_.end(); + ++bs) + { + if (bs->second.save_res_) + continue; + + char* name = new char[8 + 13 + 16 + 1]; + sprintf(name, "%08x.long_branch.%llx", this->uniq_, + static_cast(bs->first.dest_)); + Address value = (this->stub_address() - this->address() + + this->plt_size_ + bs->second.off_); + bool need_lt = false; + unsigned int stub_size = this->branch_stub_size(bs, &need_lt); + this->targ_->define_local(symtab, name, this, value, stub_size); + } +} + +// Emit the start of a __tls_get_addr_opt plt call stub. + +template +bool +Stub_table::build_tls_opt_head( + unsigned char** pp, + typename Plt_stub_entries::const_iterator cs) +{ + if (this->targ_->is_tls_get_addr_opt(cs->first.sym_)) + { + unsigned char* p = *pp; + if (size == 64) + { + write_insn(p, ld_11_3 + 0); + p += 4; + write_insn(p, ld_12_3 + 8); + p += 4; + write_insn(p, mr_0_3); + p += 4; + write_insn(p, cmpdi_11_0); + p += 4; + write_insn(p, add_3_12_13); + p += 4; + write_insn(p, beqlr); + p += 4; + write_insn(p, mr_3_0); + p += 4; + if (cs->second.r2save_ && !cs->second.localentry0_) + { + write_insn(p, mflr_11); + p += 4; + write_insn(p, (std_11_1 + this->targ_->stk_linker())); + p += 4; + } + } + else + { + write_insn(p, lwz_11_3 + 0); + p += 4; + write_insn(p, lwz_12_3 + 4); + p += 4; + write_insn(p, mr_0_3); + p += 4; + write_insn(p, cmpwi_11_0); + p += 4; + write_insn(p, add_3_12_2); + p += 4; + write_insn(p, beqlr); + p += 4; + write_insn(p, mr_3_0); + p += 4; + write_insn(p, nop); + p += 4; + } + *pp = p; + return true; + } + return false; +} + +// Emit the tail of a __tls_get_addr_opt plt call stub. + +template +bool +Stub_table::build_tls_opt_tail( + unsigned char* p, + typename Plt_stub_entries::const_iterator cs) +{ + if (size == 64 + && cs->second.r2save_ + && !cs->second.localentry0_ + && this->targ_->is_tls_get_addr_opt(cs->first.sym_)) + { + write_insn(p, bctrl); + p += 4; + write_insn(p, ld_2_1 + this->targ_->stk_toc()); + p += 4; + write_insn(p, ld_11_1 + this->targ_->stk_linker()); + p += 4; + write_insn(p, mtlr_11); + p += 4; + write_insn(p, blr); + return true; + } + return false; +} + +// Emit pc-relative plt call stub code. + +template +static unsigned char* +build_powerxx_offset(unsigned char* p, uint64_t off, uint64_t odd, bool load) +{ + uint64_t insn; + if (off - odd + (1ULL << 33) < 1ULL << 34) + { + off -= odd; + if (odd) + { + write_insn(p, nop); + p += 4; + } + if (load) + insn = pld_12_pc; + else + insn = paddi_12_pc; + insn |= d34(off); + write_insn(p, insn >> 32); + p += 4; + write_insn(p, insn & 0xffffffff); + } + else if (off - (8 - odd) + (0x20002ULL << 32) < 0x40004ULL << 32) + { + off -= 8 - odd; + write_insn(p, li_11_0 | (ha34(off) & 0xffff)); + p += 4; + if (!odd) + { + write_insn(p, sldi_11_11_34); + p += 4; + } + insn = paddi_12_pc | d34(off); + write_insn(p, insn >> 32); + p += 4; + write_insn(p, insn & 0xffffffff); + p += 4; + if (odd) + { + write_insn(p, sldi_11_11_34); + p += 4; + } + if (load) + write_insn(p, ldx_12_11_12); + else + write_insn(p, add_12_11_12); + } + else + { + off -= odd + 8; + write_insn(p, lis_11 | ((ha34(off) >> 16) & 0x3fff)); + p += 4; + write_insn(p, ori_11_11_0 | (ha34(off) & 0xffff)); + p += 4; + if (odd) + { + write_insn(p, sldi_11_11_34); + p += 4; + } + insn = paddi_12_pc | d34(off); + write_insn(p, insn >> 32); + p += 4; + write_insn(p, insn & 0xffffffff); + p += 4; + if (!odd) + { + write_insn(p, sldi_11_11_34); + p += 4; + } + if (load) + write_insn(p, ldx_12_11_12); + else + write_insn(p, add_12_11_12); + } + p += 4; + return p; +} + +// Gets the address of a label (1:) in r11 and builds an offset in r12, +// then adds it to r11 (LOAD false) or loads r12 from r11+r12 (LOAD true). +// mflr %r12 +// bcl 20,31,1f +// 1: mflr %r11 +// mtlr %r12 +// lis %r12,xxx-1b@highest +// ori %r12,%r12,xxx-1b@higher +// sldi %r12,%r12,32 +// oris %r12,%r12,xxx-1b@high +// ori %r12,%r12,xxx-1b@l +// add/ldx %r12,%r11,%r12 + +template +static unsigned char* +build_notoc_offset(unsigned char* p, uint64_t off, bool load) +{ + write_insn(p, mflr_12); + p += 4; + write_insn(p, bcl_20_31); + p += 4; + write_insn(p, mflr_11); + p += 4; + write_insn(p, mtlr_12); + p += 4; + if (off + 0x8000 < 0x10000) + { + if (load) + write_insn(p, ld_12_11 + l(off)); + else + write_insn(p, addi_12_11 + l(off)); + } + else if (off + 0x80008000ULL < 0x100000000ULL) + { + write_insn(p, addis_12_11 + ha(off)); + p += 4; + if (load) + write_insn(p, ld_12_12 + l(off)); + else + write_insn(p, addi_12_12 + l(off)); + } + else + { + if (off + 0x800000000000ULL < 0x1000000000000ULL) + { + write_insn(p, li_12_0 + ((off >> 32) & 0xffff)); + p += 4; + } + else + { + write_insn(p, lis_12 + ((off >> 48) & 0xffff)); + p += 4; + if (((off >> 32) & 0xffff) != 0) + { + write_insn(p, ori_12_12_0 + ((off >> 32) & 0xffff)); + p += 4; + } + } + if (((off >> 32) & 0xffffffffULL) != 0) + { + write_insn(p, sldi_12_12_32); + p += 4; + } + if (hi(off) != 0) + { + write_insn(p, oris_12_12_0 + hi(off)); + p += 4; + } + if (l(off) != 0) + { + write_insn(p, ori_12_12_0 + l(off)); + p += 4; + } + if (load) + write_insn(p, ldx_12_11_12); + else + write_insn(p, add_12_11_12); + } + p += 4; + return p; +} + +// Size of a given plt call stub. + +template +unsigned int +Stub_table::plt_call_size( + typename Plt_stub_entries::const_iterator p) const +{ + if (size == 32) + { + const Symbol* gsym = p->first.sym_; + return (4 * 4 + + (this->targ_->is_tls_get_addr_opt(gsym) ? 8 * 4 : 0)); + } + + const Output_data_plt_powerpc* plt; + uint64_t plt_addr = this->plt_off(p, &plt); + plt_addr += plt->address(); + unsigned int bytes = 0; + const Symbol* gsym = p->first.sym_; + if (this->targ_->is_tls_get_addr_opt(gsym)) + { + if (p->second.r2save_ && !p->second.localentry0_) + bytes = 13 * 4; + else + bytes = 7 * 4; + } + + if (p->second.r2save_) + bytes += 4; + + if (this->targ_->powerxx_stubs()) + { + uint64_t from = this->stub_address() + p->second.off_ + bytes; + if (bytes > 8 * 4) + from -= 4 * 4; + uint64_t odd = from & 4; + uint64_t off = plt_addr - from; + if (off - odd + (1ULL << 33) < 1ULL << 34) + bytes += odd + 4 * 4; + else if (off - (8 - odd) + (0x20002ULL << 32) < 0x40004ULL << 32) + bytes += 7 * 4; + else + bytes += 8 * 4; + return bytes; + } + + if (p->second.notoc_) + { + uint64_t from = this->stub_address() + p->second.off_ + bytes + 2 * 4; + if (bytes > 32) + from -= 4 * 4; + uint64_t off = plt_addr - from; + if (off + 0x8000 < 0x10000) + bytes += 7 * 4; + else if (off + 0x80008000ULL < 0x100000000ULL) + bytes += 8 * 4; + else + { + bytes += 8 * 4; + if (off + 0x800000000000ULL >= 0x1000000000000ULL + && ((off >> 32) & 0xffff) != 0) + bytes += 4; + if (((off >> 32) & 0xffffffffULL) != 0) + bytes += 4; + if (hi(off) != 0) + bytes += 4; + if (l(off) != 0) + bytes += 4; + } + return bytes; + } + + uint64_t got_addr = this->targ_->got_section()->output_section()->address(); + const Powerpc_relobj* ppcobj = static_cast + *>(p->first.object_); + got_addr += ppcobj->toc_base_offset(); + uint64_t off = plt_addr - got_addr; + bytes += 3 * 4 + 4 * (ha(off) != 0); + if (this->targ_->abiversion() < 2) + { + bool static_chain = parameters->options().plt_static_chain(); + bool thread_safe = this->targ_->plt_thread_safe(); + bytes += (4 + + 4 * static_chain + + 8 * thread_safe + + 4 * (ha(off + 8 + 8 * static_chain) != ha(off))); + } + return bytes; +} + +// Return long branch stub size. + +template +unsigned int +Stub_table::branch_stub_size( + typename Branch_stub_entries::const_iterator p, + bool* need_lt) +{ + Address loc = this->stub_address() + this->last_plt_size_ + p->second.off_; + if (size == 32) + { + if (p->first.dest_ - loc + (1 << 25) < 2 << 25) + return 4; + if (parameters->options().output_is_position_independent()) + return 32; + return 16; + } + + uint64_t off = p->first.dest_ - loc; + if (p->second.notoc_) + { + if (this->targ_->powerxx_stubs()) + { + Address odd = loc & 4; + if (off + (1 << 25) < 2 << 25) + return odd + 12; + if (off - odd + (1ULL << 33) < 1ULL << 34) + return odd + 16; + if (off - (8 - odd) + (0x20002ULL << 32) < 0x40004ULL << 32) + return 28; + return 32; + } + off -= 8; + if (off + 0x8000 < 0x10000) + return 24; + if (off + 0x80008000ULL < 0x100000000ULL) + { + if (off + 24 + (1 << 25) < 2 << 25) + return 28; + return 32; + } + unsigned int bytes = 32; + if (off + 0x800000000000ULL >= 0x1000000000000ULL + && ((off >> 32) & 0xffff) != 0) + bytes += 4; + if (((off >> 32) & 0xffffffffULL) != 0) + bytes += 4; + if (hi(off) != 0) + bytes += 4; + if (l(off) != 0) + bytes += 4; + return bytes; + } + + if (off + (1 << 25) < 2 << 25) + return 4; + if (!this->targ_->powerxx_stubs()) + *need_lt = true; + return 16; +} + +template +void +Stub_table::plt_error(const Plt_stub_key& p) +{ + if (p.sym_) + gold_error(_("linkage table error against `%s'"), + p.sym_->demangled_name().c_str()); + else + gold_error(_("linkage table error against `%s:[local %u]'"), + p.object_->name().c_str(), + p.locsym_); +} + // Write out plt and long branch stub code. template @@ -4399,50 +6115,148 @@ Stub_table::do_write(Output_file* of) unsigned char* const oview = of->get_output_view(off, oview_size); unsigned char* p; - if (size == 64) + if (size == 64 + && this->targ_->powerxx_stubs()) + { + if (!this->plt_call_stubs_.empty()) + { + // Write out plt call stubs. + typename Plt_stub_entries::const_iterator cs; + for (cs = this->plt_call_stubs_.begin(); + cs != this->plt_call_stubs_.end(); + ++cs) + { + p = oview + cs->second.off_; + this->build_tls_opt_head(&p, cs); + if (cs->second.r2save_) + { + write_insn(p, std_2_1 + this->targ_->stk_toc()); + p += 4; + } + const Output_data_plt_powerpc* plt; + Address pltoff = this->plt_off(cs, &plt); + Address plt_addr = pltoff + plt->address(); + Address from = this->stub_address() + (p - oview); + Address delta = plt_addr - from; + p = build_powerxx_offset(p, delta, from & 4, true); + write_insn(p, mtctr_12); + p += 4; + if (!this->build_tls_opt_tail(p, cs)) + write_insn(p, bctr); + } + } + + // Write out long branch stubs. + typename Branch_stub_entries::const_iterator bs; + for (bs = this->long_branch_stubs_.begin(); + bs != this->long_branch_stubs_.end(); + ++bs) + { + if (bs->second.save_res_) + continue; + Address off = this->plt_size_ + bs->second.off_; + p = oview + off; + Address loc = this->stub_address() + off; + Address delta = bs->first.dest_ - loc; + if (bs->second.notoc_ || delta + (1 << 25) >= 2 << 25) + { + unsigned char* startp = p; + p = build_powerxx_offset(p, delta, loc & 4, false); + delta -= p - startp; + } + if (delta + (1 << 25) < 2 << 25) + write_insn(p, b | (delta & 0x3fffffc)); + else + { + write_insn(p, mtctr_12); + p += 4; + write_insn(p, bctr); + } + } + } + else if (size == 64) { const Output_data_got_powerpc* got = this->targ_->got_section(); Address got_os_addr = got->output_section()->address(); - if (!this->plt_call_stubs_.empty()) + if (!this->plt_call_stubs_.empty() + && this->targ_->abiversion() >= 2) { - // The base address of the .plt section. - Address plt_base = this->targ_->plt_section()->address(); - Address iplt_base = invalid_address; - - // Write out plt call stubs. + // Write out plt call stubs for ELFv2. typename Plt_stub_entries::const_iterator cs; for (cs = this->plt_call_stubs_.begin(); cs != this->plt_call_stubs_.end(); ++cs) { - bool is_iplt; - Address pltoff = this->plt_off(cs, &is_iplt); - Address plt_addr = pltoff; - if (is_iplt) + const Output_data_plt_powerpc* plt; + Address pltoff = this->plt_off(cs, &plt); + Address plt_addr = pltoff + plt->address(); + + p = oview + cs->second.off_; + this->build_tls_opt_head(&p, cs); + if (cs->second.r2save_) { - if (iplt_base == invalid_address) - iplt_base = this->targ_->iplt_section()->address(); - plt_addr += iplt_base; + write_insn(p, std_2_1 + this->targ_->stk_toc()); + p += 4; + } + if (cs->second.notoc_) + { + Address from = this->stub_address() + (p - oview) + 8; + Address off = plt_addr - from; + p = build_notoc_offset(p, off, true); } else - plt_addr += plt_base; + { + const Powerpc_relobj* ppcobj = static_cast + *>(cs->first.object_); + Address got_addr = got_os_addr + ppcobj->toc_base_offset(); + Address off = plt_addr - got_addr; + + if (off + 0x80008000 > 0xffffffff || (off & 7) != 0) + this->plt_error(cs->first); + + if (ha(off) != 0) + { + write_insn(p, addis_12_2 + ha(off)); + p += 4; + write_insn(p, ld_12_12 + l(off)); + p += 4; + } + else + { + write_insn(p, ld_12_2 + l(off)); + p += 4; + } + } + write_insn(p, mtctr_12); + p += 4; + if (!this->build_tls_opt_tail(p, cs)) + write_insn(p, bctr); + } + } + else if (!this->plt_call_stubs_.empty()) + { + // Write out plt call stubs for ELFv1. + typename Plt_stub_entries::const_iterator cs; + for (cs = this->plt_call_stubs_.begin(); + cs != this->plt_call_stubs_.end(); + ++cs) + { + const Output_data_plt_powerpc* plt; + Address pltoff = this->plt_off(cs, &plt); + Address plt_addr = pltoff + plt->address(); const Powerpc_relobj* ppcobj = static_cast *>(cs->first.object_); Address got_addr = got_os_addr + ppcobj->toc_base_offset(); Address off = plt_addr - got_addr; - if (off + 0x80008000 > 0xffffffff || (off & 7) != 0) - gold_error(_("%s: linkage table error against `%s'"), - cs->first.object_->name().c_str(), - cs->first.sym_->demangled_name().c_str()); + if (off + 0x80008000 > 0xffffffff || (off & 7) != 0 + || cs->second.notoc_) + this->plt_error(cs->first); - bool plt_load_toc = this->targ_->abiversion() < 2; - bool static_chain - = plt_load_toc && parameters->options().plt_static_chain(); - bool thread_safe - = plt_load_toc && this->targ_->plt_thread_safe(); + bool static_chain = parameters->options().plt_static_chain(); + bool thread_safe = this->targ_->plt_thread_safe(); bool use_fake_dep = false; Address cmp_branch_off = 0; if (thread_safe) @@ -4451,14 +6265,15 @@ Stub_table::do_write(Output_file* of) = ((pltoff - this->targ_->first_plt_entry_offset()) / this->targ_->plt_entry_size()); Address glinkoff - = (this->targ_->glink_section()->pltresolve_size + = (this->targ_->glink_section()->pltresolve_size() + pltindex * 8); if (pltindex > 32768) glinkoff += (pltindex - 32768) * 4; Address to = this->targ_->glink_section()->address() + glinkoff; Address from - = (this->stub_address() + cs->second + 24 + = (this->stub_address() + cs->second.off_ + 20 + + 4 * cs->second.r2save_ + 4 * (ha(off) != 0) + 4 * (ha(off + 8 + 8 * static_chain) != ha(off)) + 4 * static_chain); @@ -4466,60 +6281,48 @@ Stub_table::do_write(Output_file* of) use_fake_dep = cmp_branch_off + (1 << 25) >= (1 << 26); } - p = oview + cs->second; - if (ha(off) != 0) + p = oview + cs->second.off_; + if (this->build_tls_opt_head(&p, cs)) + use_fake_dep = thread_safe; + if (cs->second.r2save_) { write_insn(p, std_2_1 + this->targ_->stk_toc()); p += 4; - if (plt_load_toc) + } + if (ha(off) != 0) + { + write_insn(p, addis_11_2 + ha(off)); + p += 4; + write_insn(p, ld_12_11 + l(off)); + p += 4; + if (ha(off + 8 + 8 * static_chain) != ha(off)) { - write_insn(p, addis_11_2 + ha(off)); - p += 4; - write_insn(p, ld_12_11 + l(off)); + write_insn(p, addi_11_11 + l(off)); p += 4; + off = 0; } - else + write_insn(p, mtctr_12); + p += 4; + if (use_fake_dep) { - write_insn(p, addis_12_2 + ha(off)); + write_insn(p, xor_2_12_12); p += 4; - write_insn(p, ld_12_12 + l(off)); + write_insn(p, add_11_11_2); p += 4; } - if (plt_load_toc - && ha(off + 8 + 8 * static_chain) != ha(off)) - { - write_insn(p, addi_11_11 + l(off)); - p += 4; - off = 0; - } - write_insn(p, mtctr_12); + write_insn(p, ld_2_11 + l(off + 8)); p += 4; - if (plt_load_toc) + if (static_chain) { - if (use_fake_dep) - { - write_insn(p, xor_2_12_12); - p += 4; - write_insn(p, add_11_11_2); - p += 4; - } - write_insn(p, ld_2_11 + l(off + 8)); + write_insn(p, ld_11_11 + l(off + 16)); p += 4; - if (static_chain) - { - write_insn(p, ld_11_11 + l(off + 16)); - p += 4; - } } } else { - write_insn(p, std_2_1 + this->targ_->stk_toc()); - p += 4; write_insn(p, ld_12_2 + l(off)); p += 4; - if (plt_load_toc - && ha(off + 8 + 8 * static_chain) != ha(off)) + if (ha(off + 8 + 8 * static_chain) != ha(off)) { write_insn(p, addi_2_2 + l(off)); p += 4; @@ -4527,25 +6330,24 @@ Stub_table::do_write(Output_file* of) } write_insn(p, mtctr_12); p += 4; - if (plt_load_toc) + if (use_fake_dep) + { + write_insn(p, xor_11_12_12); + p += 4; + write_insn(p, add_2_2_11); + p += 4; + } + if (static_chain) { - if (use_fake_dep) - { - write_insn(p, xor_11_12_12); - p += 4; - write_insn(p, add_2_2_11); - p += 4; - } - if (static_chain) - { - write_insn(p, ld_11_2 + l(off + 16)); - p += 4; - } - write_insn(p, ld_2_2 + l(off + 8)); + write_insn(p, ld_11_2 + l(off + 16)); p += 4; } + write_insn(p, ld_2_2 + l(off + 8)); + p += 4; } - if (thread_safe && !use_fake_dep) + if (this->build_tls_opt_tail(p, cs)) + ; + else if (thread_safe && !use_fake_dep) { write_insn(p, cmpldi_2_0); p += 4; @@ -4564,14 +6366,19 @@ Stub_table::do_write(Output_file* of) bs != this->long_branch_stubs_.end(); ++bs) { - if (bs->first.save_res_) + if (bs->second.save_res_) continue; - p = oview + this->plt_size_ + bs->second; - Address loc = this->stub_address() + this->plt_size_ + bs->second; + Address off = this->plt_size_ + bs->second.off_; + p = oview + off; + Address loc = this->stub_address() + off; Address delta = bs->first.dest_ - loc; - if (delta + (1 << 25) < 2 << 25) - write_insn(p, b | (delta & 0x3fffffc)); - else + if (bs->second.notoc_) + { + unsigned char* startp = p; + p = build_notoc_offset(p, off, false); + delta -= p - startp; + } + else if (delta + (1 << 25) >= 2 << 25) { Address brlt_addr = this->targ_->find_branch_lookup_table(bs->first.dest_); @@ -4581,25 +6388,31 @@ Stub_table::do_write(Output_file* of) Address brltoff = brlt_addr - got_addr; if (ha(brltoff) == 0) { - write_insn(p, ld_12_2 + l(brltoff)), p += 4; + write_insn(p, ld_12_2 + l(brltoff)); + p += 4; } else { - write_insn(p, addis_12_2 + ha(brltoff)), p += 4; - write_insn(p, ld_12_12 + l(brltoff)), p += 4; + write_insn(p, addis_12_2 + ha(brltoff)); + p += 4; + write_insn(p, ld_12_12 + l(brltoff)); + p += 4; } - write_insn(p, mtctr_12), p += 4; + } + if (delta + (1 << 25) < 2 << 25) + write_insn(p, b | (delta & 0x3fffffc)); + else + { + write_insn(p, mtctr_12); + p += 4; write_insn(p, bctr); } } } - else + else // size == 32 { if (!this->plt_call_stubs_.empty()) { - // The base address of the .plt section. - Address plt_base = this->targ_->plt_section()->address(); - Address iplt_base = invalid_address; // The address of _GLOBAL_OFFSET_TABLE_. Address g_o_t = invalid_address; @@ -4609,18 +6422,12 @@ Stub_table::do_write(Output_file* of) cs != this->plt_call_stubs_.end(); ++cs) { - bool is_iplt; - Address plt_addr = this->plt_off(cs, &is_iplt); - if (is_iplt) - { - if (iplt_base == invalid_address) - iplt_base = this->targ_->iplt_section()->address(); - plt_addr += iplt_base; - } - else - plt_addr += plt_base; + const Output_data_plt_powerpc* plt; + Address plt_addr = this->plt_off(cs, &plt); + plt_addr += plt->address(); - p = oview + cs->second; + p = oview + cs->second.off_; + this->build_tls_opt_head(&p, cs); if (parameters->options().output_is_position_independent()) { Address got_addr; @@ -4648,26 +6455,24 @@ Stub_table::do_write(Output_file* of) Address off = plt_addr - got_addr; if (ha(off) == 0) - { - write_insn(p + 0, lwz_11_30 + l(off)); - write_insn(p + 4, mtctr_11); - write_insn(p + 8, bctr); - } + write_insn(p, lwz_11_30 + l(off)); else { - write_insn(p + 0, addis_11_30 + ha(off)); - write_insn(p + 4, lwz_11_11 + l(off)); - write_insn(p + 8, mtctr_11); - write_insn(p + 12, bctr); + write_insn(p, addis_11_30 + ha(off)); + p += 4; + write_insn(p, lwz_11_11 + l(off)); } } else { - write_insn(p + 0, lis_11 + ha(plt_addr)); - write_insn(p + 4, lwz_11_11 + l(plt_addr)); - write_insn(p + 8, mtctr_11); - write_insn(p + 12, bctr); + write_insn(p, lis_11 + ha(plt_addr)); + p += 4; + write_insn(p, lwz_11_11 + l(plt_addr)); } + p += 4; + write_insn(p, mtctr_11); + p += 4; + write_insn(p, bctr); } } @@ -4677,32 +6482,39 @@ Stub_table::do_write(Output_file* of) bs != this->long_branch_stubs_.end(); ++bs) { - if (bs->first.save_res_) + if (bs->second.save_res_) continue; - p = oview + this->plt_size_ + bs->second; - Address loc = this->stub_address() + this->plt_size_ + bs->second; + Address off = this->plt_size_ + bs->second.off_; + p = oview + off; + Address loc = this->stub_address() + off; Address delta = bs->first.dest_ - loc; if (delta + (1 << 25) < 2 << 25) write_insn(p, b | (delta & 0x3fffffc)); else if (!parameters->options().output_is_position_independent()) { - write_insn(p + 0, lis_12 + ha(bs->first.dest_)); - write_insn(p + 4, addi_12_12 + l(bs->first.dest_)); - write_insn(p + 8, mtctr_12); - write_insn(p + 12, bctr); + write_insn(p, lis_12 + ha(bs->first.dest_)); + p += 4; + write_insn(p, addi_12_12 + l(bs->first.dest_)); } else { delta -= 8; - write_insn(p + 0, mflr_0); - write_insn(p + 4, bcl_20_31); - write_insn(p + 8, mflr_12); - write_insn(p + 12, addis_12_12 + ha(delta)); - write_insn(p + 16, addi_12_12 + l(delta)); - write_insn(p + 20, mtlr_0); - write_insn(p + 24, mtctr_12); - write_insn(p + 28, bctr); + write_insn(p, mflr_0); + p += 4; + write_insn(p, bcl_20_31); + p += 4; + write_insn(p, mflr_12); + p += 4; + write_insn(p, addis_12_12 + ha(delta)); + p += 4; + write_insn(p, addi_12_12 + l(delta)); + p += 4; + write_insn(p, mtlr_0); } + p += 4; + write_insn(p, mtctr_12); + p += 4; + write_insn(p, bctr); } } if (this->need_save_res_) @@ -4758,6 +6570,7 @@ Output_data_glink::do_write(Output_file* of) write_insn(p, mflr_0), p += 4; write_insn(p, bcl_20_31), p += 4; write_insn(p, mflr_11), p += 4; + write_insn(p, std_2_1 + 24), p += 4; write_insn(p, ld_2_11 + l(-16)), p += 4; write_insn(p, mtlr_0), p += 4; write_insn(p, sub_12_12_11), p += 4; @@ -4769,8 +6582,7 @@ Output_data_glink::do_write(Output_file* of) write_insn(p, ld_11_11 + 8), p += 4; } write_insn(p, bctr), p += 4; - while (p < oview + this->pltresolve_size) - write_insn(p, nop), p += 4; + gold_assert(p == oview + this->pltresolve_size()); // Write lazy link call stubs. uint32_t indx = 0; @@ -4796,7 +6608,7 @@ Output_data_glink::do_write(Output_file* of) Address plt_base = this->targ_->plt_section()->address(); Address iplt_base = invalid_address; - unsigned int global_entry_off = (this->end_branch_table_ + 15) & -16; + unsigned int global_entry_off = this->global_entry_off(); Address global_entry_base = this->address() + global_entry_off; typename Global_entry_stub_entries::const_iterator ge; for (ge = this->global_entry_stubs_.begin(); @@ -4818,8 +6630,7 @@ Output_data_glink::do_write(Output_file* of) Address off = plt_addr - my_addr; if (off + 0x80008000 > 0xffffffff || (off & 3) != 0) - gold_error(_("%s: linkage table error against `%s'"), - ge->first->object()->name().c_str(), + gold_error(_("linkage table error against `%s'"), ge->first->demangled_name().c_str()); write_insn(p, addis_12_12 + ha(off)), p += 4; @@ -4837,7 +6648,7 @@ Output_data_glink::do_write(Output_file* of) // Write out pltresolve branch table. p = oview; - unsigned int the_end = oview_size - this->pltresolve_size; + unsigned int the_end = oview_size - this->pltresolve_size(); unsigned char* end_p = oview + the_end; while (p < end_p - 8 * 4) write_insn(p, b + end_p - p), p += 4; @@ -4845,68 +6656,85 @@ Output_data_glink::do_write(Output_file* of) write_insn(p, nop), p += 4; // Write out pltresolve call stub. + end_p = oview + oview_size; if (parameters->options().output_is_position_independent()) { Address res0_off = 0; Address after_bcl_off = the_end + 12; Address bcl_res0 = after_bcl_off - res0_off; - write_insn(p + 0, addis_11_11 + ha(bcl_res0)); - write_insn(p + 4, mflr_0); - write_insn(p + 8, bcl_20_31); - write_insn(p + 12, addi_11_11 + l(bcl_res0)); - write_insn(p + 16, mflr_12); - write_insn(p + 20, mtlr_0); - write_insn(p + 24, sub_11_11_12); + write_insn(p, addis_11_11 + ha(bcl_res0)); + p += 4; + write_insn(p, mflr_0); + p += 4; + write_insn(p, bcl_20_31); + p += 4; + write_insn(p, addi_11_11 + l(bcl_res0)); + p += 4; + write_insn(p, mflr_12); + p += 4; + write_insn(p, mtlr_0); + p += 4; + write_insn(p, sub_11_11_12); + p += 4; Address got_bcl = g_o_t + 4 - (after_bcl_off + this->address()); - write_insn(p + 28, addis_12_12 + ha(got_bcl)); + write_insn(p, addis_12_12 + ha(got_bcl)); + p += 4; if (ha(got_bcl) == ha(got_bcl + 4)) { - write_insn(p + 32, lwz_0_12 + l(got_bcl)); - write_insn(p + 36, lwz_12_12 + l(got_bcl + 4)); + write_insn(p, lwz_0_12 + l(got_bcl)); + p += 4; + write_insn(p, lwz_12_12 + l(got_bcl + 4)); } else { - write_insn(p + 32, lwzu_0_12 + l(got_bcl)); - write_insn(p + 36, lwz_12_12 + 4); + write_insn(p, lwzu_0_12 + l(got_bcl)); + p += 4; + write_insn(p, lwz_12_12 + 4); } - write_insn(p + 40, mtctr_0); - write_insn(p + 44, add_0_11_11); - write_insn(p + 48, add_11_0_11); - write_insn(p + 52, bctr); - write_insn(p + 56, nop); - write_insn(p + 60, nop); + p += 4; + write_insn(p, mtctr_0); + p += 4; + write_insn(p, add_0_11_11); + p += 4; + write_insn(p, add_11_0_11); } else { Address res0 = this->address(); - write_insn(p + 0, lis_12 + ha(g_o_t + 4)); - write_insn(p + 4, addis_11_11 + ha(-res0)); + write_insn(p, lis_12 + ha(g_o_t + 4)); + p += 4; + write_insn(p, addis_11_11 + ha(-res0)); + p += 4; if (ha(g_o_t + 4) == ha(g_o_t + 8)) - write_insn(p + 8, lwz_0_12 + l(g_o_t + 4)); + write_insn(p, lwz_0_12 + l(g_o_t + 4)); else - write_insn(p + 8, lwzu_0_12 + l(g_o_t + 4)); - write_insn(p + 12, addi_11_11 + l(-res0)); - write_insn(p + 16, mtctr_0); - write_insn(p + 20, add_0_11_11); + write_insn(p, lwzu_0_12 + l(g_o_t + 4)); + p += 4; + write_insn(p, addi_11_11 + l(-res0)); + p += 4; + write_insn(p, mtctr_0); + p += 4; + write_insn(p, add_0_11_11); + p += 4; if (ha(g_o_t + 4) == ha(g_o_t + 8)) - write_insn(p + 24, lwz_12_12 + l(g_o_t + 8)); + write_insn(p, lwz_12_12 + l(g_o_t + 8)); else - write_insn(p + 24, lwz_12_12 + 4); - write_insn(p + 28, add_11_0_11); - write_insn(p + 32, bctr); - write_insn(p + 36, nop); - write_insn(p + 40, nop); - write_insn(p + 44, nop); - write_insn(p + 48, nop); - write_insn(p + 52, nop); - write_insn(p + 56, nop); - write_insn(p + 60, nop); + write_insn(p, lwz_12_12 + 4); + p += 4; + write_insn(p, add_11_0_11); + } + p += 4; + write_insn(p, bctr); + p += 4; + while (p < end_p) + { + write_insn(p, nop); + p += 4; } - p += 64; } of->write_output_view(off, oview_size, oview); @@ -5286,6 +7114,20 @@ Target_powerpc::make_plt_entry(Symbol_table* symtab, } } +// Make a PLT entry for a local symbol. + +template +void +Target_powerpc::make_local_plt_entry( + Layout* layout, + Sized_relobj_file* relobj, + unsigned int r_sym) +{ + if (this->lplt_ == NULL) + this->make_lplt_section(layout); + this->lplt_->add_local_entry(relobj, r_sym); +} + // Make a PLT entry for a local STT_GNU_IFUNC symbol. template @@ -5363,6 +7205,15 @@ Target_powerpc::Scan::get_reference_flags( case elfcpp::R_POWERPC_ADDR16_LO: case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_ADDR16_HA: + case elfcpp::R_PPC64_ADDR16_HIGHER34: + case elfcpp::R_PPC64_ADDR16_HIGHERA34: + case elfcpp::R_PPC64_ADDR16_HIGHEST34: + case elfcpp::R_PPC64_ADDR16_HIGHESTA34: + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_D34_HI30: + case elfcpp::R_PPC64_D34_HA30: + case elfcpp::R_PPC64_D28: ref = Symbol::ABSOLUTE_REF; break; @@ -5380,9 +7231,25 @@ Target_powerpc::Scan::get_reference_flags( case elfcpp::R_POWERPC_REL16_LO: case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: + case elfcpp::R_PPC64_REL16_HIGH: + case elfcpp::R_PPC64_REL16_HIGHA: + case elfcpp::R_PPC64_REL16_HIGHER: + case elfcpp::R_PPC64_REL16_HIGHERA: + case elfcpp::R_PPC64_REL16_HIGHEST: + case elfcpp::R_PPC64_REL16_HIGHESTA: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_REL16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: + case elfcpp::R_PPC64_PCREL28: ref = Symbol::RELATIVE_REF; break; + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: case elfcpp::R_POWERPC_REL14: @@ -5397,17 +7264,32 @@ Target_powerpc::Scan::get_reference_flags( case elfcpp::R_POWERPC_GOT16_HA: case elfcpp::R_PPC64_GOT16_DS: case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_GOT_PCREL34: case elfcpp::R_PPC64_TOC16: case elfcpp::R_PPC64_TOC16_LO: case elfcpp::R_PPC64_TOC16_HI: case elfcpp::R_PPC64_TOC16_HA: case elfcpp::R_PPC64_TOC16_DS: case elfcpp::R_PPC64_TOC16_LO_DS: + case elfcpp::R_POWERPC_PLT16_LO: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_PPC64_PLT16_LO_DS: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: ref = Symbol::RELATIVE_REF; break; case elfcpp::R_POWERPC_GOT_TPREL16: case elfcpp::R_POWERPC_TLS: + case elfcpp::R_PPC64_TLSGD: + case elfcpp::R_PPC64_TLSLD: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_TPREL34: + case elfcpp::R_PPC64_GOT_DTPREL34: ref = Symbol::TLS_REF; break; @@ -5473,7 +7355,6 @@ Target_powerpc::Scan::check_non_pic(Relobj* object, case elfcpp::R_POWERPC_ADDR14_BRTAKEN: case elfcpp::R_POWERPC_ADDR14_BRNTAKEN: case elfcpp::R_POWERPC_REL32: - case elfcpp::R_POWERPC_REL24: case elfcpp::R_POWERPC_TPREL16: case elfcpp::R_POWERPC_TPREL16_LO: case elfcpp::R_POWERPC_TPREL16_HI: @@ -5522,6 +7403,7 @@ Target_powerpc::Scan::check_non_pic(Relobj* object, { // These are the relocation types supported only on 32-bit. // ??? glibc ld.so doesn't need to support these. + case elfcpp::R_POWERPC_REL24: case elfcpp::R_POWERPC_DTPREL16: case elfcpp::R_POWERPC_DTPREL16_LO: case elfcpp::R_POWERPC_DTPREL16_HI: @@ -5584,9 +7466,28 @@ Target_powerpc::Scan::reloc_needs_plt_for_ifunc( case elfcpp::R_POWERPC_GOT16_HA: case elfcpp::R_PPC64_GOT16_DS: case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_GOT_PCREL34: return false; + // PLT relocs are OK and need a PLT entry. + case elfcpp::R_POWERPC_PLT16_LO: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_PPC64_PLT16_LO_DS: + case elfcpp::R_POWERPC_PLTSEQ: + case elfcpp::R_POWERPC_PLTCALL: + case elfcpp::R_PPC64_PLTSEQ_NOTOC: + case elfcpp::R_PPC64_PLTCALL_NOTOC: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + return true; + break; + // Function calls are good, and these do need a PLT entry. + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_ADDR14: case elfcpp::R_POWERPC_ADDR14_BRTAKEN: @@ -5617,6 +7518,45 @@ Target_powerpc::Scan::reloc_needs_plt_for_ifunc( return false; } +// Return TRUE iff INSN is one we expect on a _LO variety toc/got +// reloc. + +static bool +ok_lo_toc_insn(uint32_t insn, unsigned int r_type) +{ + return ((insn & (0x3f << 26)) == 12u << 26 /* addic */ + || (insn & (0x3f << 26)) == 14u << 26 /* addi */ + || (insn & (0x3f << 26)) == 32u << 26 /* lwz */ + || (insn & (0x3f << 26)) == 34u << 26 /* lbz */ + || (insn & (0x3f << 26)) == 36u << 26 /* stw */ + || (insn & (0x3f << 26)) == 38u << 26 /* stb */ + || (insn & (0x3f << 26)) == 40u << 26 /* lhz */ + || (insn & (0x3f << 26)) == 42u << 26 /* lha */ + || (insn & (0x3f << 26)) == 44u << 26 /* sth */ + || (insn & (0x3f << 26)) == 46u << 26 /* lmw */ + || (insn & (0x3f << 26)) == 47u << 26 /* stmw */ + || (insn & (0x3f << 26)) == 48u << 26 /* lfs */ + || (insn & (0x3f << 26)) == 50u << 26 /* lfd */ + || (insn & (0x3f << 26)) == 52u << 26 /* stfs */ + || (insn & (0x3f << 26)) == 54u << 26 /* stfd */ + || (insn & (0x3f << 26)) == 56u << 26 /* lq,lfq */ + || ((insn & (0x3f << 26)) == 57u << 26 /* lxsd,lxssp,lfdp */ + /* Exclude lfqu by testing reloc. If relocs are ever + defined for the reduced D field in psq_lu then those + will need testing too. */ + && r_type != elfcpp::R_PPC64_TOC16_LO + && r_type != elfcpp::R_POWERPC_GOT16_LO) + || ((insn & (0x3f << 26)) == 58u << 26 /* ld,lwa */ + && (insn & 1) == 0) + || (insn & (0x3f << 26)) == 60u << 26 /* stfq */ + || ((insn & (0x3f << 26)) == 61u << 26 /* lxv,stx{v,sd,ssp},stfdp */ + /* Exclude stfqu. psq_stu as above for psq_lu. */ + && r_type != elfcpp::R_PPC64_TOC16_LO + && r_type != elfcpp::R_POWERPC_GOT16_LO) + || ((insn & (0x3f << 26)) == 62u << 26 /* std,stq */ + && (insn & 1) == 0)); +} + // Scan a relocation for a local symbol. template @@ -5633,7 +7573,7 @@ Target_powerpc::Scan::local( const elfcpp::Sym& lsym, bool is_discarded) { - this->maybe_skip_tls_get_addr_call(r_type, NULL); + this->maybe_skip_tls_get_addr_call(target, r_type, NULL); if ((size == 64 && r_type == elfcpp::R_PPC64_TLSGD) || (size == 32 && r_type == elfcpp::R_PPC_TLSGD)) @@ -5679,9 +7619,30 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_NONE: case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: - case elfcpp::R_PPC64_TOCSAVE: case elfcpp::R_POWERPC_TLS: case elfcpp::R_PPC64_ENTRY: + case elfcpp::R_POWERPC_PLTSEQ: + case elfcpp::R_POWERPC_PLTCALL: + case elfcpp::R_PPC64_PLTSEQ_NOTOC: + case elfcpp::R_PPC64_PLTCALL_NOTOC: + case elfcpp::R_PPC64_PCREL_OPT: + case elfcpp::R_PPC64_ADDR16_HIGHER34: + case elfcpp::R_PPC64_ADDR16_HIGHERA34: + case elfcpp::R_PPC64_ADDR16_HIGHEST34: + case elfcpp::R_PPC64_ADDR16_HIGHESTA34: + case elfcpp::R_PPC64_REL16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_D34_HI30: + case elfcpp::R_PPC64_D34_HA30: + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: break; case elfcpp::R_PPC64_TOC: @@ -5773,6 +7734,23 @@ Target_powerpc::Scan::local( } break; + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_POWERPC_PLT16_LO: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_PPC64_PLT16_LO_DS: + if (!is_ifunc) + { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + target->make_local_plt_entry(layout, object, r_sym); + } + break; + + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: case elfcpp::R_PPC_LOCAL24PC: @@ -5780,9 +7758,32 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: if (!is_ifunc) - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), + r_type, r_sym, reloc.get_r_addend()); + } + break; + + case elfcpp::R_PPC64_TOCSAVE: + // R_PPC64_TOCSAVE follows a call instruction to indicate the + // caller has already saved r2 and thus a plt call stub need not + // save r2. + if (size == 64 + && target->mark_pltcall(ppc_object, data_shndx, + reloc.get_r_offset() - 4, symtab)) + { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + unsigned int shndx = lsym.get_st_shndx(); + bool is_ordinary; + shndx = object->adjust_sym_shndx(r_sym, shndx, &is_ordinary); + if (!is_ordinary) + object->error(_("tocsave symbol %u has bad shndx %u"), + r_sym, shndx); + else + target->add_tocsave(ppc_object, shndx, + lsym.get_st_value() + reloc.get_r_addend()); + } break; case elfcpp::R_PPC64_REL64: @@ -5792,6 +7793,12 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: case elfcpp::R_POWERPC_REL16DX_HA: + case elfcpp::R_PPC64_REL16_HIGH: + case elfcpp::R_PPC64_REL16_HIGHA: + case elfcpp::R_PPC64_REL16_HIGHER: + case elfcpp::R_PPC64_REL16_HIGHERA: + case elfcpp::R_PPC64_REL16_HIGHEST: + case elfcpp::R_PPC64_REL16_HIGHESTA: case elfcpp::R_POWERPC_SECTOFF: case elfcpp::R_POWERPC_SECTOFF_LO: case elfcpp::R_POWERPC_SECTOFF_HI: @@ -5827,6 +7834,7 @@ Target_powerpc::Scan::local( case elfcpp::R_PPC64_ADDR64_LOCAL: break; + case elfcpp::R_PPC64_GOT_PCREL34: case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: case elfcpp::R_POWERPC_GOT16_HI: @@ -5875,6 +7883,7 @@ Target_powerpc::Scan::local( target->got_section(symtab, layout); break; + case elfcpp::R_PPC64_GOT_TLSGD34: case elfcpp::R_POWERPC_GOT_TLSGD16: case elfcpp::R_POWERPC_GOT_TLSGD16_LO: case elfcpp::R_POWERPC_GOT_TLSGD16_HI: @@ -5899,6 +7908,7 @@ Target_powerpc::Scan::local( } break; + case elfcpp::R_PPC64_GOT_TLSLD34: case elfcpp::R_POWERPC_GOT_TLSLD16: case elfcpp::R_POWERPC_GOT_TLSLD16_LO: case elfcpp::R_POWERPC_GOT_TLSLD16_HI: @@ -5922,6 +7932,7 @@ Target_powerpc::Scan::local( } break; + case elfcpp::R_PPC64_GOT_DTPREL34: case elfcpp::R_POWERPC_GOT_DTPREL16: case elfcpp::R_POWERPC_GOT_DTPREL16_LO: case elfcpp::R_POWERPC_GOT_DTPREL16_HI: @@ -5934,6 +7945,7 @@ Target_powerpc::Scan::local( } break; + case elfcpp::R_PPC64_GOT_TPREL34: case elfcpp::R_POWERPC_GOT_TPREL16: case elfcpp::R_POWERPC_GOT_TPREL16_LO: case elfcpp::R_POWERPC_GOT_TPREL16_HI: @@ -5970,6 +7982,150 @@ Target_powerpc::Scan::local( break; } + if (size == 64 + && parameters->options().toc_optimize()) + { + if (data_shndx == ppc_object->toc_shndx()) + { + bool ok = true; + if (r_type != elfcpp::R_PPC64_ADDR64 + || (is_ifunc && target->abiversion() < 2)) + ok = false; + else if (parameters->options().output_is_position_independent()) + { + if (is_ifunc) + ok = false; + else + { + unsigned int shndx = lsym.get_st_shndx(); + if (shndx >= elfcpp::SHN_LORESERVE + && shndx != elfcpp::SHN_XINDEX) + ok = false; + } + } + if (!ok) + ppc_object->set_no_toc_opt(reloc.get_r_offset()); + } + + enum {no_check, check_lo, check_ha} insn_check; + switch (r_type) + { + default: + insn_check = no_check; + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_HA: + case elfcpp::R_POWERPC_GOT_TLSGD16_HA: + case elfcpp::R_POWERPC_GOT_TPREL16_HA: + case elfcpp::R_POWERPC_GOT_DTPREL16_HA: + case elfcpp::R_POWERPC_GOT16_HA: + case elfcpp::R_PPC64_TOC16_HA: + insn_check = check_ha; + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_LO: + case elfcpp::R_POWERPC_GOT_TLSGD16_LO: + case elfcpp::R_POWERPC_GOT_TPREL16_LO: + case elfcpp::R_POWERPC_GOT_DTPREL16_LO: + case elfcpp::R_POWERPC_GOT16_LO: + case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_TOC16_LO: + case elfcpp::R_PPC64_TOC16_LO_DS: + insn_check = check_lo; + break; + } + + section_size_type slen; + const unsigned char* view = NULL; + if (insn_check != no_check) + { + view = ppc_object->section_contents(data_shndx, &slen, false); + section_size_type off = + convert_to_section_size_type(reloc.get_r_offset()) & -4; + if (off < slen) + { + uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off); + if (insn_check == check_lo + ? !ok_lo_toc_insn(insn, r_type) + : ((insn & ((0x3f << 26) | 0x1f << 16)) + != ((15u << 26) | (2 << 16)) /* addis rt,2,imm */)) + { + ppc_object->set_no_toc_opt(); + gold_warning(_("%s: toc optimization is not supported " + "for %#08x instruction"), + ppc_object->name().c_str(), insn); + } + } + } + + switch (r_type) + { + default: + break; + case elfcpp::R_PPC64_TOC16: + case elfcpp::R_PPC64_TOC16_LO: + case elfcpp::R_PPC64_TOC16_HI: + case elfcpp::R_PPC64_TOC16_HA: + case elfcpp::R_PPC64_TOC16_DS: + case elfcpp::R_PPC64_TOC16_LO_DS: + unsigned int shndx = lsym.get_st_shndx(); + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + bool is_ordinary; + shndx = ppc_object->adjust_sym_shndx(r_sym, shndx, &is_ordinary); + if (is_ordinary && shndx == ppc_object->toc_shndx()) + { + Address dst_off = lsym.get_st_value() + reloc.get_r_addend(); + if (dst_off < ppc_object->section_size(shndx)) + { + bool ok = false; + if (r_type == elfcpp::R_PPC64_TOC16_HA) + ok = true; + else if (r_type == elfcpp::R_PPC64_TOC16_LO_DS) + { + // Need to check that the insn is a ld + if (!view) + view = ppc_object->section_contents(data_shndx, + &slen, + false); + section_size_type off = + (convert_to_section_size_type(reloc.get_r_offset()) + + (big_endian ? -2 : 3)); + if (off < slen + && (view[off] & (0x3f << 2)) == 58u << 2) + ok = true; + } + if (!ok) + ppc_object->set_no_toc_opt(dst_off); + } + } + break; + } + } + + if (size == 32) + { + switch (r_type) + { + case elfcpp::R_POWERPC_REL32: + if (ppc_object->got2_shndx() != 0 + && parameters->options().output_is_position_independent()) + { + unsigned int shndx = lsym.get_st_shndx(); + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + bool is_ordinary; + shndx = ppc_object->adjust_sym_shndx(r_sym, shndx, &is_ordinary); + if (is_ordinary && shndx == ppc_object->got2_shndx() + && (ppc_object->section_flags(data_shndx) + & elfcpp::SHF_EXECINSTR) != 0) + gold_error(_("%s: unsupported -mbss-plt code"), + ppc_object->name().c_str()); + } + break; + default: + break; + } + } + switch (r_type) { case elfcpp::R_POWERPC_GOT_TLSLD16: @@ -5981,6 +8137,52 @@ Target_powerpc::Scan::local( case elfcpp::R_PPC64_TOC16: case elfcpp::R_PPC64_TOC16_DS: ppc_object->set_has_small_toc_reloc(); + break; + default: + break; + } + + switch (r_type) + { + case elfcpp::R_POWERPC_TPREL16: + case elfcpp::R_POWERPC_TPREL16_LO: + case elfcpp::R_POWERPC_TPREL16_HI: + case elfcpp::R_POWERPC_TPREL16_HA: + case elfcpp::R_PPC64_TPREL16_DS: + case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: + case elfcpp::R_PPC64_TPREL16_HIGHER: + case elfcpp::R_PPC64_TPREL16_HIGHERA: + case elfcpp::R_PPC64_TPREL16_HIGHEST: + case elfcpp::R_PPC64_TPREL16_HIGHESTA: + case elfcpp::R_PPC64_TPREL34: + layout->set_has_static_tls(); + break; + default: + break; + } + + switch (r_type) + { + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_D34_HI30: + case elfcpp::R_PPC64_D34_HA30: + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_PPC64_GOT_PCREL34: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_DTPREL34: + case elfcpp::R_PPC64_GOT_TPREL34: + target->set_powerxx_stubs(); + break; default: break; } @@ -6014,9 +8216,15 @@ Target_powerpc::Scan::global( unsigned int r_type, Symbol* gsym) { - if (this->maybe_skip_tls_get_addr_call(r_type, gsym) == Track_tls::SKIP) + if (this->maybe_skip_tls_get_addr_call(target, r_type, gsym) + == Track_tls::SKIP) return; + if (target->replace_tls_get_addr(gsym)) + // Change a __tls_get_addr reference to __tls_get_addr_opt + // so dynamic relocs are emitted against the latter symbol. + gsym = target->tls_get_addr_opt(); + if ((size == 64 && r_type == elfcpp::R_PPC64_TLSGD) || (size == 32 && r_type == elfcpp::R_PPC_TLSGD)) { @@ -6043,9 +8251,9 @@ Target_powerpc::Scan::global( bool pushed_ifunc = false; if (is_ifunc && this->reloc_needs_plt_for_ifunc(target, object, r_type, true)) { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + r_type, r_sym, reloc.get_r_addend()); target->make_plt_entry(symtab, layout, gsym); pushed_ifunc = true; } @@ -6058,6 +8266,28 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC_LOCAL24PC: case elfcpp::R_POWERPC_TLS: case elfcpp::R_PPC64_ENTRY: + case elfcpp::R_POWERPC_PLTSEQ: + case elfcpp::R_POWERPC_PLTCALL: + case elfcpp::R_PPC64_PLTSEQ_NOTOC: + case elfcpp::R_PPC64_PLTCALL_NOTOC: + case elfcpp::R_PPC64_PCREL_OPT: + case elfcpp::R_PPC64_ADDR16_HIGHER34: + case elfcpp::R_PPC64_ADDR16_HIGHERA34: + case elfcpp::R_PPC64_ADDR16_HIGHEST34: + case elfcpp::R_PPC64_ADDR16_HIGHESTA34: + case elfcpp::R_PPC64_REL16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_D34_HI30: + case elfcpp::R_PPC64_D34_HA30: + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: break; case elfcpp::R_PPC64_TOC: @@ -6135,9 +8365,9 @@ Target_powerpc::Scan::global( } if (!is_ifunc || (!pushed_ifunc && need_ifunc_plt)) { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); target->push_branch(ppc_object, data_shndx, - reloc.get_r_offset(), r_type, - elfcpp::elf_r_sym(reloc.get_r_info()), + reloc.get_r_offset(), r_type, r_sym, reloc.get_r_addend()); target->make_plt_entry(symtab, layout, gsym); } @@ -6183,19 +8413,37 @@ Target_powerpc::Scan::global( object, data_shndx, reloc.get_r_offset(), reloc.get_r_addend()); + + if (size == 64 + && parameters->options().toc_optimize() + && data_shndx == ppc_object->toc_shndx()) + ppc_object->set_no_toc_opt(reloc.get_r_offset()); } } } break; + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_POWERPC_PLT16_LO: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_PPC64_PLT16_LO_DS: + if (!pushed_ifunc) + target->make_plt_entry(symtab, layout, gsym); + break; + + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_PPC_PLTREL24: case elfcpp::R_POWERPC_REL24: if (!is_ifunc) { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, - elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + r_type, r_sym, reloc.get_r_addend()); if (gsym->needs_plt_entry() || (!gsym->final_value_is_known() && (gsym->is_undefined() @@ -6233,9 +8481,34 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: if (!is_ifunc) - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), + r_type, r_sym, reloc.get_r_addend()); + } + break; + + case elfcpp::R_PPC64_TOCSAVE: + // R_PPC64_TOCSAVE follows a call instruction to indicate the + // caller has already saved r2 and thus a plt call stub need not + // save r2. + if (size == 64 + && target->mark_pltcall(ppc_object, data_shndx, + reloc.get_r_offset() - 4, symtab)) + { + unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); + bool is_ordinary; + unsigned int shndx = gsym->shndx(&is_ordinary); + if (!is_ordinary) + object->error(_("tocsave symbol %u has bad shndx %u"), + r_sym, shndx); + else + { + Sized_symbol* sym = symtab->get_sized_symbol(gsym); + target->add_tocsave(ppc_object, shndx, + sym->value() + reloc.get_r_addend()); + } + } break; case elfcpp::R_POWERPC_REL16: @@ -6243,6 +8516,12 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: case elfcpp::R_POWERPC_REL16DX_HA: + case elfcpp::R_PPC64_REL16_HIGH: + case elfcpp::R_PPC64_REL16_HIGHA: + case elfcpp::R_PPC64_REL16_HIGHER: + case elfcpp::R_PPC64_REL16_HIGHERA: + case elfcpp::R_PPC64_REL16_HIGHEST: + case elfcpp::R_PPC64_REL16_HIGHESTA: case elfcpp::R_POWERPC_SECTOFF: case elfcpp::R_POWERPC_SECTOFF_LO: case elfcpp::R_POWERPC_SECTOFF_HI: @@ -6278,6 +8557,7 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC64_ADDR64_LOCAL: break; + case elfcpp::R_PPC64_GOT_PCREL34: case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: case elfcpp::R_POWERPC_GOT16_HI: @@ -6336,6 +8616,7 @@ Target_powerpc::Scan::global( target->got_section(symtab, layout); break; + case elfcpp::R_PPC64_GOT_TLSGD34: case elfcpp::R_POWERPC_GOT_TLSGD16: case elfcpp::R_POWERPC_GOT_TLSGD16_LO: case elfcpp::R_POWERPC_GOT_TLSGD16_HI: @@ -6384,6 +8665,7 @@ Target_powerpc::Scan::global( } break; + case elfcpp::R_PPC64_GOT_TLSLD34: case elfcpp::R_POWERPC_GOT_TLSLD16: case elfcpp::R_POWERPC_GOT_TLSLD16_LO: case elfcpp::R_POWERPC_GOT_TLSLD16_HI: @@ -6407,6 +8689,7 @@ Target_powerpc::Scan::global( } break; + case elfcpp::R_PPC64_GOT_DTPREL34: case elfcpp::R_POWERPC_GOT_DTPREL16: case elfcpp::R_POWERPC_GOT_DTPREL16_LO: case elfcpp::R_POWERPC_GOT_DTPREL16_HI: @@ -6426,6 +8709,7 @@ Target_powerpc::Scan::global( } break; + case elfcpp::R_PPC64_GOT_TPREL34: case elfcpp::R_POWERPC_GOT_TPREL16: case elfcpp::R_POWERPC_GOT_TPREL16_LO: case elfcpp::R_POWERPC_GOT_TPREL16_HI: @@ -6465,9 +8749,139 @@ Target_powerpc::Scan::global( } break; - default: - unsupported_reloc_global(object, r_type, gsym); - break; + default: + unsupported_reloc_global(object, r_type, gsym); + break; + } + + if (size == 64 + && parameters->options().toc_optimize()) + { + if (data_shndx == ppc_object->toc_shndx()) + { + bool ok = true; + if (r_type != elfcpp::R_PPC64_ADDR64 + || (is_ifunc && target->abiversion() < 2)) + ok = false; + else if (parameters->options().output_is_position_independent() + && (is_ifunc || gsym->is_absolute() || gsym->is_undefined())) + ok = false; + if (!ok) + ppc_object->set_no_toc_opt(reloc.get_r_offset()); + } + + enum {no_check, check_lo, check_ha} insn_check; + switch (r_type) + { + default: + insn_check = no_check; + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_HA: + case elfcpp::R_POWERPC_GOT_TLSGD16_HA: + case elfcpp::R_POWERPC_GOT_TPREL16_HA: + case elfcpp::R_POWERPC_GOT_DTPREL16_HA: + case elfcpp::R_POWERPC_GOT16_HA: + case elfcpp::R_PPC64_TOC16_HA: + insn_check = check_ha; + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_LO: + case elfcpp::R_POWERPC_GOT_TLSGD16_LO: + case elfcpp::R_POWERPC_GOT_TPREL16_LO: + case elfcpp::R_POWERPC_GOT_DTPREL16_LO: + case elfcpp::R_POWERPC_GOT16_LO: + case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_TOC16_LO: + case elfcpp::R_PPC64_TOC16_LO_DS: + insn_check = check_lo; + break; + } + + section_size_type slen; + const unsigned char* view = NULL; + if (insn_check != no_check) + { + view = ppc_object->section_contents(data_shndx, &slen, false); + section_size_type off = + convert_to_section_size_type(reloc.get_r_offset()) & -4; + if (off < slen) + { + uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off); + if (insn_check == check_lo + ? !ok_lo_toc_insn(insn, r_type) + : ((insn & ((0x3f << 26) | 0x1f << 16)) + != ((15u << 26) | (2 << 16)) /* addis rt,2,imm */)) + { + ppc_object->set_no_toc_opt(); + gold_warning(_("%s: toc optimization is not supported " + "for %#08x instruction"), + ppc_object->name().c_str(), insn); + } + } + } + + switch (r_type) + { + default: + break; + case elfcpp::R_PPC64_TOC16: + case elfcpp::R_PPC64_TOC16_LO: + case elfcpp::R_PPC64_TOC16_HI: + case elfcpp::R_PPC64_TOC16_HA: + case elfcpp::R_PPC64_TOC16_DS: + case elfcpp::R_PPC64_TOC16_LO_DS: + if (gsym->source() == Symbol::FROM_OBJECT + && !gsym->object()->is_dynamic()) + { + Powerpc_relobj* sym_object + = static_cast*>(gsym->object()); + bool is_ordinary; + unsigned int shndx = gsym->shndx(&is_ordinary); + if (shndx == sym_object->toc_shndx()) + { + Sized_symbol* sym = symtab->get_sized_symbol(gsym); + Address dst_off = sym->value() + reloc.get_r_addend(); + if (dst_off < sym_object->section_size(shndx)) + { + bool ok = false; + if (r_type == elfcpp::R_PPC64_TOC16_HA) + ok = true; + else if (r_type == elfcpp::R_PPC64_TOC16_LO_DS) + { + // Need to check that the insn is a ld + if (!view) + view = ppc_object->section_contents(data_shndx, + &slen, + false); + section_size_type off = + (convert_to_section_size_type(reloc.get_r_offset()) + + (big_endian ? -2 : 3)); + if (off < slen + && (view[off] & (0x3f << 2)) == (58u << 2)) + ok = true; + } + if (!ok) + sym_object->set_no_toc_opt(dst_off); + } + } + } + break; + } + } + + if (size == 32) + { + switch (r_type) + { + case elfcpp::R_PPC_LOCAL24PC: + if (strcmp(gsym->name(), "_GLOBAL_OFFSET_TABLE_") == 0) + gold_error(_("%s: unsupported -mbss-plt code"), + ppc_object->name().c_str()); + break; + default: + break; + } } switch (r_type) @@ -6481,6 +8895,52 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC64_TOC16: case elfcpp::R_PPC64_TOC16_DS: ppc_object->set_has_small_toc_reloc(); + break; + default: + break; + } + + switch (r_type) + { + case elfcpp::R_POWERPC_TPREL16: + case elfcpp::R_POWERPC_TPREL16_LO: + case elfcpp::R_POWERPC_TPREL16_HI: + case elfcpp::R_POWERPC_TPREL16_HA: + case elfcpp::R_PPC64_TPREL16_DS: + case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: + case elfcpp::R_PPC64_TPREL16_HIGHER: + case elfcpp::R_PPC64_TPREL16_HIGHERA: + case elfcpp::R_PPC64_TPREL16_HIGHEST: + case elfcpp::R_PPC64_TPREL16_HIGHESTA: + case elfcpp::R_PPC64_TPREL34: + layout->set_has_static_tls(); + break; + default: + break; + } + + switch (r_type) + { + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_D34_HI30: + case elfcpp::R_PPC64_D34_HA30: + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_PPC64_GOT_PCREL34: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_DTPREL34: + case elfcpp::R_PPC64_GOT_TPREL34: + target->set_powerxx_stubs(); + break; default: break; } @@ -6785,6 +9245,23 @@ Target_powerpc::scan_relocs( typedef gold::Default_classify_reloc Classify_reloc; + if (!this->plt_localentry0_init_) + { + bool plt_localentry0 = false; + if (size == 64 + && this->abiversion() >= 2) + { + if (parameters->options().user_set_plt_localentry()) + plt_localentry0 = parameters->options().plt_localentry(); + if (plt_localentry0 + && symtab->lookup("GLIBC_2.26", NULL) == NULL) + gold_warning(_("--plt-localentry is especially dangerous without " + "ld.so support to detect ABI violations")); + } + this->plt_localentry0_ = plt_localentry0; + this->plt_localentry0_init_ = true; + } + if (sh_type == elfcpp::SHT_REL) { gold_error(_("%s: unsupported REL reloc section"), @@ -6893,7 +9370,7 @@ template void Target_powerpc::do_finalize_sections( Layout* layout, - const Input_objects*, + const Input_objects* input_objects, Symbol_table* symtab) { if (parameters->doing_static_link()) @@ -6970,6 +9447,8 @@ Target_powerpc::do_finalize_sections( odyn->add_section_plus_offset(elfcpp::DT_PPC_GOT, this->got_, this->got_->g_o_t()); } + if (this->has_tls_get_addr_opt_) + odyn->add_constant(elfcpp::DT_PPC_OPT, elfcpp::PPC_OPT_TLS); } else { @@ -6978,9 +9457,15 @@ Target_powerpc::do_finalize_sections( this->glink_->finalize_data_size(); odyn->add_section_plus_offset(elfcpp::DT_PPC64_GLINK, this->glink_, - (this->glink_->pltresolve_size + (this->glink_->pltresolve_size() - 32)); } + if (this->has_localentry0_ || this->has_tls_get_addr_opt_) + odyn->add_constant(elfcpp::DT_PPC64_OPT, + ((this->has_localentry0_ + ? elfcpp::PPC64_OPT_LOCALENTRY : 0) + | (this->has_tls_get_addr_opt_ + ? elfcpp::PPC64_OPT_TLS : 0))); } } @@ -6988,33 +9473,279 @@ Target_powerpc::do_finalize_sections( // relocs. if (this->copy_relocs_.any_saved_relocs()) this->copy_relocs_.emit(this->rela_dyn_section(layout)); + + for (Input_objects::Relobj_iterator p = input_objects->relobj_begin(); + p != input_objects->relobj_end(); + ++p) + { + Powerpc_relobj* ppc_relobj + = static_cast*>(*p); + if (ppc_relobj->attributes_section_data()) + this->merge_object_attributes(ppc_relobj->name().c_str(), + ppc_relobj->attributes_section_data()); + } + for (Input_objects::Dynobj_iterator p = input_objects->dynobj_begin(); + p != input_objects->dynobj_end(); + ++p) + { + Powerpc_dynobj* ppc_dynobj + = static_cast*>(*p); + if (ppc_dynobj->attributes_section_data()) + this->merge_object_attributes(ppc_dynobj->name().c_str(), + ppc_dynobj->attributes_section_data()); + } + + // Create a .gnu.attributes section if we have merged any attributes + // from inputs. + if (this->attributes_section_data_ != NULL + && this->attributes_section_data_->size() != 0) + { + Output_attributes_section_data* attributes_section + = new Output_attributes_section_data(*this->attributes_section_data_); + layout->add_output_section_data(".gnu.attributes", + elfcpp::SHT_GNU_ATTRIBUTES, 0, + attributes_section, ORDER_INVALID, false); + } } -// Return TRUE iff INSN is one we expect on a _LO variety toc/got -// reloc. +// Merge object attributes from input file called NAME with those of the +// output. The input object attributes are in the object pointed by PASD. -static bool -ok_lo_toc_insn(uint32_t insn) +template +void +Target_powerpc::merge_object_attributes( + const char* name, + const Attributes_section_data* pasd) { - return ((insn & (0x3f << 26)) == 14u << 26 /* addi */ - || (insn & (0x3f << 26)) == 32u << 26 /* lwz */ - || (insn & (0x3f << 26)) == 34u << 26 /* lbz */ - || (insn & (0x3f << 26)) == 36u << 26 /* stw */ - || (insn & (0x3f << 26)) == 38u << 26 /* stb */ - || (insn & (0x3f << 26)) == 40u << 26 /* lhz */ - || (insn & (0x3f << 26)) == 42u << 26 /* lha */ - || (insn & (0x3f << 26)) == 44u << 26 /* sth */ - || (insn & (0x3f << 26)) == 46u << 26 /* lmw */ - || (insn & (0x3f << 26)) == 47u << 26 /* stmw */ - || (insn & (0x3f << 26)) == 48u << 26 /* lfs */ - || (insn & (0x3f << 26)) == 50u << 26 /* lfd */ - || (insn & (0x3f << 26)) == 52u << 26 /* stfs */ - || (insn & (0x3f << 26)) == 54u << 26 /* stfd */ - || ((insn & (0x3f << 26)) == 58u << 26 /* lwa,ld,lmd */ - && (insn & 3) != 1) - || ((insn & (0x3f << 26)) == 62u << 26 /* std, stmd */ - && ((insn & 3) == 0 || (insn & 3) == 3)) - || (insn & (0x3f << 26)) == 12u << 26 /* addic */); + // Return if there is no attributes section data. + if (pasd == NULL) + return; + + // Create output object attributes. + if (this->attributes_section_data_ == NULL) + this->attributes_section_data_ = new Attributes_section_data(NULL, 0); + + const int vendor = Object_attribute::OBJ_ATTR_GNU; + const Object_attribute* in_attr = pasd->known_attributes(vendor); + Object_attribute* out_attr + = this->attributes_section_data_->known_attributes(vendor); + + const char* err; + const char* first; + const char* second; + int tag = elfcpp::Tag_GNU_Power_ABI_FP; + int in_fp = in_attr[tag].int_value() & 0xf; + int out_fp = out_attr[tag].int_value() & 0xf; + if (in_fp != out_fp) + { + err = NULL; + if ((in_fp & 3) == 0) + ; + else if ((out_fp & 3) == 0) + { + out_fp |= in_fp & 3; + out_attr[tag].set_int_value(out_fp); + out_attr[tag].set_type(Object_attribute::ATTR_TYPE_FLAG_INT_VAL); + this->last_fp_ = name; + } + else if ((out_fp & 3) != 2 && (in_fp & 3) == 2) + { + err = N_("%s uses hard float, %s uses soft float"); + first = this->last_fp_; + second = name; + } + else if ((out_fp & 3) == 2 && (in_fp & 3) != 2) + { + err = N_("%s uses hard float, %s uses soft float"); + first = name; + second = this->last_fp_; + } + else if ((out_fp & 3) == 1 && (in_fp & 3) == 3) + { + err = N_("%s uses double-precision hard float, " + "%s uses single-precision hard float"); + first = this->last_fp_; + second = name; + } + else if ((out_fp & 3) == 3 && (in_fp & 3) == 1) + { + err = N_("%s uses double-precision hard float, " + "%s uses single-precision hard float"); + first = name; + second = this->last_fp_; + } + + if (err || (in_fp & 0xc) == 0) + ; + else if ((out_fp & 0xc) == 0) + { + out_fp |= in_fp & 0xc; + out_attr[tag].set_int_value(out_fp); + out_attr[tag].set_type(Object_attribute::ATTR_TYPE_FLAG_INT_VAL); + this->last_ld_ = name; + } + else if ((out_fp & 0xc) != 2 * 4 && (in_fp & 0xc) == 2 * 4) + { + err = N_("%s uses 64-bit long double, %s uses 128-bit long double"); + first = name; + second = this->last_ld_; + } + else if ((in_fp & 0xc) != 2 * 4 && (out_fp & 0xc) == 2 * 4) + { + err = N_("%s uses 64-bit long double, %s uses 128-bit long double"); + first = this->last_ld_; + second = name; + } + else if ((out_fp & 0xc) == 1 * 4 && (in_fp & 0xc) == 3 * 4) + { + err = N_("%s uses IBM long double, %s uses IEEE long double"); + first = this->last_ld_; + second = name; + } + else if ((out_fp & 0xc) == 3 * 4 && (in_fp & 0xc) == 1 * 4) + { + err = N_("%s uses IBM long double, %s uses IEEE long double"); + first = name; + second = this->last_ld_; + } + + if (err) + { + if (parameters->options().warn_mismatch()) + gold_error(_(err), first, second); + // Arrange for this attribute to be deleted. It's better to + // say "don't know" about a file than to wrongly claim compliance. + out_attr[tag].set_type(0); + } + } + + if (size == 32) + { + tag = elfcpp::Tag_GNU_Power_ABI_Vector; + int in_vec = in_attr[tag].int_value() & 3; + int out_vec = out_attr[tag].int_value() & 3; + if (in_vec != out_vec) + { + err = NULL; + if (in_vec == 0) + ; + else if (out_vec == 0) + { + out_vec = in_vec; + out_attr[tag].set_int_value(out_vec); + out_attr[tag].set_type(Object_attribute::ATTR_TYPE_FLAG_INT_VAL); + this->last_vec_ = name; + } + // For now, allow generic to transition to AltiVec or SPE + // without a warning. If GCC marked files with their stack + // alignment and used don't-care markings for files which are + // not affected by the vector ABI, we could warn about this + // case too. */ + else if (in_vec == 1) + ; + else if (out_vec == 1) + { + out_vec = in_vec; + out_attr[tag].set_int_value(out_vec); + out_attr[tag].set_type(Object_attribute::ATTR_TYPE_FLAG_INT_VAL); + this->last_vec_ = name; + } + else if (out_vec < in_vec) + { + err = N_("%s uses AltiVec vector ABI, %s uses SPE vector ABI"); + first = this->last_vec_; + second = name; + } + else if (out_vec > in_vec) + { + err = N_("%s uses AltiVec vector ABI, %s uses SPE vector ABI"); + first = name; + second = this->last_vec_; + } + if (err) + { + if (parameters->options().warn_mismatch()) + gold_error(_(err), first, second); + out_attr[tag].set_type(0); + } + } + + tag = elfcpp::Tag_GNU_Power_ABI_Struct_Return; + int in_struct = in_attr[tag].int_value() & 3; + int out_struct = out_attr[tag].int_value() & 3; + if (in_struct != out_struct) + { + err = NULL; + if (in_struct == 0 || in_struct == 3) + ; + else if (out_struct == 0) + { + out_struct = in_struct; + out_attr[tag].set_int_value(out_struct); + out_attr[tag].set_type(Object_attribute::ATTR_TYPE_FLAG_INT_VAL); + this->last_struct_ = name; + } + else if (out_struct < in_struct) + { + err = N_("%s uses r3/r4 for small structure returns, " + "%s uses memory"); + first = this->last_struct_; + second = name; + } + else if (out_struct > in_struct) + { + err = N_("%s uses r3/r4 for small structure returns, " + "%s uses memory"); + first = name; + second = this->last_struct_; + } + if (err) + { + if (parameters->options().warn_mismatch()) + gold_error(_(err), first, second); + out_attr[tag].set_type(0); + } + } + } + + // Merge Tag_compatibility attributes and any common GNU ones. + this->attributes_section_data_->merge(name, pasd); +} + +// Emit any saved relocs, and mark toc entries using any of these +// relocs as not optimizable. + +template +void +Powerpc_copy_relocs::emit( + Output_data_reloc* reloc_section) +{ + if (size == 64 + && parameters->options().toc_optimize()) + { + for (typename Copy_relocs:: + Copy_reloc_entries::iterator p = this->entries_.begin(); + p != this->entries_.end(); + ++p) + { + typename Copy_relocs::Copy_reloc_entry& + entry = *p; + + // If the symbol is no longer defined in a dynamic object, + // then we emitted a COPY relocation. If it is still + // dynamic then we'll need dynamic relocations and thus + // can't optimize toc entries. + if (entry.sym_->is_from_dynobj()) + { + Powerpc_relobj* ppc_object + = static_cast*>(entry.relobj_); + if (entry.shndx_ == ppc_object->toc_shndx()) + ppc_object->set_no_toc_opt(entry.address_); + } + } + } + + Copy_relocs::emit(reloc_section); } // Return the value to use for a branch relocation. @@ -7036,7 +9767,8 @@ Target_powerpc::symval_for_branch( // descriptor, use the function descriptor code entry address Powerpc_relobj* symobj = object; if (gsym != NULL - && gsym->source() != Symbol::FROM_OBJECT) + && (gsym->source() != Symbol::FROM_OBJECT + || gsym->object()->is_dynamic())) return true; if (gsym != NULL) symobj = static_cast*>(gsym->object()); @@ -7068,6 +9800,145 @@ Target_powerpc::symval_for_branch( return true; } +template +static bool +relative_value_is_known(const Sized_symbol* gsym) +{ + if (gsym->type() == elfcpp::STT_GNU_IFUNC) + return false; + + if (gsym->is_from_dynobj() + || gsym->is_undefined() + || gsym->is_preemptible()) + return false; + + if (gsym->is_absolute()) + return !parameters->options().output_is_position_independent(); + + return true; +} + +template +static bool +relative_value_is_known(const Symbol_value* psymval) +{ + if (psymval->is_ifunc_symbol()) + return false; + + bool is_ordinary; + unsigned int shndx = psymval->input_shndx(&is_ordinary); + + return is_ordinary && shndx != elfcpp::SHN_UNDEF; +} + +// PCREL_OPT in one instance flags to the linker that a pair of insns: +// pld ra,symbol@got@pcrel +// load/store rt,0(ra) +// or +// pla ra,symbol@pcrel +// load/store rt,0(ra) +// may be translated to +// pload/pstore rt,symbol@pcrel +// nop. +// This function returns true if the optimization is possible, placing +// the prefix insn in *PINSN1 and a NOP in *PINSN2. +// +// On entry to this function, the linker has already determined that +// the pld can be replaced with pla: *PINSN1 is that pla insn, +// while *PINSN2 is the second instruction. + +inline bool +xlate_pcrel_opt(uint64_t *pinsn1, uint64_t *pinsn2) +{ + uint32_t insn2 = *pinsn2 >> 32; + uint64_t i1new; + + // Check that regs match. + if (((insn2 >> 16) & 31) != ((*pinsn1 >> 21) & 31)) + return false; + + switch ((insn2 >> 26) & 63) + { + default: + return false; + + case 32: // lwz + case 34: // lbz + case 36: // stw + case 38: // stb + case 40: // lhz + case 42: // lha + case 44: // sth + case 48: // lfs + case 50: // lfd + case 52: // stfs + case 54: // stfd + // These are the PMLS cases, where we just need to tack a prefix + // on the insn. Check that the D field is zero. + if ((insn2 & 0xffff) != 0) + return false; + i1new = ((1ULL << 58) | (2ULL << 56) | (1ULL << 52) + | (insn2 & ((63ULL << 26) | (31ULL << 21)))); + break; + + case 58: // lwa, ld + if ((insn2 & 0xfffd) != 0) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | (insn2 & 2 ? 41ULL << 26 : 57ULL << 26) + | (insn2 & (31ULL << 21))); + break; + + case 57: // lxsd, lxssp + if ((insn2 & 0xfffc) != 0 || (insn2 & 3) < 2) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | ((40ULL | (insn2 & 3)) << 26) + | (insn2 & (31ULL << 21))); + break; + + case 61: // stxsd, stxssp, lxv, stxv + if ((insn2 & 3) == 0) + return false; + else if ((insn2 & 3) >= 2) + { + if ((insn2 & 0xfffc) != 0) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | ((44ULL | (insn2 & 3)) << 26) + | (insn2 & (31ULL << 21))); + } + else + { + if ((insn2 & 0xfff0) != 0) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | ((50ULL | (insn2 & 4) | ((insn2 & 8) >> 3)) << 26) + | (insn2 & (31ULL << 21))); + } + break; + + case 56: // lq + if ((insn2 & 0xffff) != 0) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | (insn2 & ((63ULL << 26) | (31ULL << 21)))); + break; + + case 62: // std, stq + if ((insn2 & 0xfffd) != 0) + return false; + i1new = ((1ULL << 58) | (1ULL << 52) + | ((insn2 & 2) == 0 ? 61ULL << 26 : 60ULL << 26) + | (insn2 & (31ULL << 21))); + break; + } + + *pinsn1 = i1new; + *pinsn2 = (uint64_t) nop << 32; + return true; +} + // Perform a relocation. template @@ -7085,12 +9956,19 @@ Target_powerpc::Relocate::relocate( Address address, section_size_type view_size) { + typedef Powerpc_relocate_functions Reloc; + typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; + typedef typename elfcpp::Rela Reltype; + if (view == NULL) return true; + if (target->replace_tls_get_addr(gsym)) + gsym = static_cast*>(target->tls_get_addr_opt()); + const elfcpp::Rela rela(preloc); unsigned int r_type = elfcpp::elf_r_type(rela.get_r_info()); - switch (this->maybe_skip_tls_get_addr_call(r_type, gsym)) + switch (this->maybe_skip_tls_get_addr_call(target, r_type, gsym)) { case Track_tls::NOT_EXPECTED: gold_error_at_location(relinfo, relnum, rela.get_r_offset(), @@ -7100,15 +9978,30 @@ Target_powerpc::Relocate::relocate( // We have already complained. break; case Track_tls::SKIP: + if (is_plt16_reloc(r_type) + || r_type == elfcpp::R_POWERPC_PLTSEQ + || r_type == elfcpp::R_PPC64_PLTSEQ_NOTOC) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + } + else if (size == 64 && r_type == elfcpp::R_POWERPC_PLTCALL) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, nop); + } + else if (size == 64 && (r_type == elfcpp::R_PPC64_PLT_PCREL34 + || r_type == elfcpp::R_PPC64_PLT_PCREL34_NOTOC)) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview, pnop >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, pnop & 0xffffffff); + } return true; case Track_tls::NORMAL: break; } - typedef Powerpc_relocate_functions Reloc; - typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; - typedef typename Reloc_types::Reloc Reltype; // Offset from start of insn to d-field reloc. const int d_offset = big_endian ? 2 : 0; @@ -7116,10 +10009,20 @@ Target_powerpc::Relocate::relocate( = static_cast*>(relinfo->object); Address value = 0; bool has_stub_value = false; + bool localentry0 = false; unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); - if ((gsym != NULL + bool has_plt_offset + = (gsym != NULL ? gsym->use_plt_offset(Scan::get_reference_flags(r_type, target)) - : object->local_has_plt_offset(r_sym)) + : object->local_has_plt_offset(r_sym)); + if (has_plt_offset + && !is_plt16_reloc(r_type) + && r_type != elfcpp::R_PPC64_PLT_PCREL34 + && r_type != elfcpp::R_PPC64_PLT_PCREL34_NOTOC + && r_type != elfcpp::R_POWERPC_PLTSEQ + && r_type != elfcpp::R_POWERPC_PLTCALL + && r_type != elfcpp::R_PPC64_PLTSEQ_NOTOC + && r_type != elfcpp::R_PPC64_PLTCALL_NOTOC && (!psymval->is_ifunc_symbol() || Scan::reloc_needs_plt_for_ifunc(target, object, r_type, false))) { @@ -7127,7 +10030,7 @@ Target_powerpc::Relocate::relocate( && gsym != NULL && target->abiversion() >= 2 && !parameters->options().output_is_position_independent() - && !is_branch_reloc(r_type)) + && !is_branch_reloc(r_type)) { Address off = target->glink_section()->find_global_entry(gsym); if (off != invalid_address) @@ -7138,26 +10041,53 @@ Target_powerpc::Relocate::relocate( } else { - Stub_table* stub_table - = object->stub_table(relinfo->data_shndx); + Stub_table* stub_table = NULL; + if (target->stub_tables().size() == 1) + stub_table = target->stub_tables()[0]; + if (stub_table == NULL + && !(size == 32 + && gsym != NULL + && !parameters->options().output_is_position_independent() + && !is_branch_reloc(r_type))) + stub_table = object->stub_table(relinfo->data_shndx); if (stub_table == NULL) { - // This is a ref from a data section to an ifunc symbol. + // This is a ref from a data section to an ifunc symbol, + // or a non-branch reloc for which we always want to use + // one set of stubs for resolving function addresses. if (target->stub_tables().size() != 0) stub_table = target->stub_tables()[0]; } if (stub_table != NULL) { - Address off; + const typename Stub_table::Plt_stub_ent* ent; if (gsym != NULL) - off = stub_table->find_plt_call_entry(object, gsym, r_type, + ent = stub_table->find_plt_call_entry(object, gsym, r_type, rela.get_r_addend()); else - off = stub_table->find_plt_call_entry(object, r_sym, r_type, + ent = stub_table->find_plt_call_entry(object, r_sym, r_type, rela.get_r_addend()); - if (off != invalid_address) + if (ent != NULL) { - value = stub_table->stub_address() + off; + value = stub_table->stub_address() + ent->off_; + const int reloc_size = elfcpp::Elf_sizes::rela_size; + elfcpp::Shdr shdr(relinfo->reloc_shdr); + size_t reloc_count = shdr.get_sh_size() / reloc_size; + if (size == 64 + && ent->r2save_ + && r_type == elfcpp::R_PPC64_REL24_NOTOC) + value += 4; + else if (size == 64 + && ent->r2save_ + && relnum < reloc_count - 1) + { + Reltype next_rela(preloc + reloc_size); + if (elfcpp::elf_r_type(next_rela.get_r_info()) + == elfcpp::R_PPC64_TOCSAVE + && next_rela.get_r_offset() == rela.get_r_offset() + 4) + value += 4; + } + localentry0 = ent->localentry0_; has_stub_value = true; } } @@ -7168,12 +10098,63 @@ Target_powerpc::Relocate::relocate( gold_assert(has_stub_value || !(os->flags() & elfcpp::SHF_ALLOC)); } - if (r_type == elfcpp::R_POWERPC_GOT16 - || r_type == elfcpp::R_POWERPC_GOT16_LO - || r_type == elfcpp::R_POWERPC_GOT16_HI - || r_type == elfcpp::R_POWERPC_GOT16_HA - || r_type == elfcpp::R_PPC64_GOT16_DS - || r_type == elfcpp::R_PPC64_GOT16_LO_DS) + if (has_plt_offset && (is_plt16_reloc(r_type) + || r_type == elfcpp::R_PPC64_PLT_PCREL34 + || r_type == elfcpp::R_PPC64_PLT_PCREL34_NOTOC)) + { + const Output_data_plt_powerpc* plt; + if (gsym) + value = target->plt_off(gsym, &plt); + else + value = target->plt_off(object, r_sym, &plt); + value += plt->address(); + + if (size == 64) + { + if (r_type != elfcpp::R_PPC64_PLT_PCREL34 + && r_type != elfcpp::R_PPC64_PLT_PCREL34_NOTOC) + value -= (target->got_section()->output_section()->address() + + object->toc_base_offset()); + } + else if (parameters->options().output_is_position_independent()) + { + if (rela.get_r_addend() >= 32768) + { + unsigned int got2 = object->got2_shndx(); + value -= (object->get_output_section_offset(got2) + + object->output_section(got2)->address() + + rela.get_r_addend()); + } + else + value -= (target->got_section()->address() + + target->got_section()->g_o_t()); + } + } + else if (!has_plt_offset + && (is_plt16_reloc(r_type) + || r_type == elfcpp::R_POWERPC_PLTSEQ + || r_type == elfcpp::R_PPC64_PLTSEQ_NOTOC)) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + r_type = elfcpp::R_POWERPC_NONE; + } + else if (!has_plt_offset + && (r_type == elfcpp::R_PPC64_PLT_PCREL34 + || r_type == elfcpp::R_PPC64_PLT_PCREL34_NOTOC)) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview, pnop >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, pnop & 0xffffffff); + r_type = elfcpp::R_POWERPC_NONE; + } + else if (r_type == elfcpp::R_POWERPC_GOT16 + || r_type == elfcpp::R_POWERPC_GOT16_LO + || r_type == elfcpp::R_POWERPC_GOT16_HI + || r_type == elfcpp::R_POWERPC_GOT16_HA + || r_type == elfcpp::R_PPC64_GOT16_DS + || r_type == elfcpp::R_PPC64_GOT16_LO_DS + || r_type == elfcpp::R_PPC64_GOT_PCREL34) { if (gsym != NULL) { @@ -7182,11 +10163,13 @@ Target_powerpc::Relocate::relocate( } else { - unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD)); value = object->local_got_offset(r_sym, GOT_TYPE_STANDARD); } - value -= target->got_section()->got_base_offset(object); + if (r_type == elfcpp::R_PPC64_GOT_PCREL34) + value += target->got_section()->address(); + else + value -= target->got_section()->got_base_offset(object); } else if (r_type == elfcpp::R_PPC64_TOC) { @@ -7202,8 +10185,8 @@ Target_powerpc::Relocate::relocate( { typedef typename elfcpp::Swap<32, big_endian>::Valtype Valtype; Valtype* wv = reinterpret_cast(view); - bool can_plt_call = false; - if (rela.get_r_offset() + 8 <= view_size) + bool can_plt_call = localentry0 || target->is_tls_get_addr_opt(gsym); + if (!can_plt_call && rela.get_r_offset() + 8 <= view_size) { Valtype insn = elfcpp::Swap<32, big_endian>::readval(wv); Valtype insn2 = elfcpp::Swap<32, big_endian>::readval(wv + 1); @@ -7265,7 +10248,8 @@ Target_powerpc::Relocate::relocate( else if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_HI - || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_HA) + || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_HA + || r_type == elfcpp::R_PPC64_GOT_TLSGD34) { // First instruction of a global dynamic sequence, arg setup insn. const bool final = gsym == NULL || gsym->final_value_is_known(); @@ -7284,71 +10268,124 @@ Target_powerpc::Relocate::relocate( } else { - unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); gold_assert(object->local_has_got_offset(r_sym, got_type)); value = object->local_got_offset(r_sym, got_type); } - value -= target->got_section()->got_base_offset(object); + if (r_type == elfcpp::R_PPC64_GOT_TLSGD34) + value += target->got_section()->address(); + else + value -= target->got_section()->got_base_offset(object); } if (tls_type == tls::TLSOPT_TO_IE) { - if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 - || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) + if (r_type == elfcpp::R_PPC64_GOT_TLSGD34) { - Insn* iview = reinterpret_cast(view - d_offset); - Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); - insn &= (1 << 26) - (1 << 16); // extract rt,ra from addi - if (size == 32) - insn |= 32 << 26; // lwz - else - insn |= 58 << 26; // ld - elfcpp::Swap<32, big_endian>::writeval(iview, insn); + Insn* iview = reinterpret_cast(view); + uint64_t pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + // pla -> pld + pinsn += (-2ULL << 56) + (57ULL << 26) - (14ULL << 26); + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + r_type = elfcpp::R_PPC64_GOT_TPREL34; + } + else + { + if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 + || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + insn &= (1 << 26) - (1 << 16); // extract rt,ra from addi + if (size == 32) + insn |= 32 << 26; // lwz + else + insn |= 58 << 26; // ld + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + } + r_type += (elfcpp::R_POWERPC_GOT_TPREL16 + - elfcpp::R_POWERPC_GOT_TLSGD16); } - r_type += (elfcpp::R_POWERPC_GOT_TPREL16 - - elfcpp::R_POWERPC_GOT_TLSGD16); } else if (tls_type == tls::TLSOPT_TO_LE) { - if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 - || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) + if (r_type == elfcpp::R_PPC64_GOT_TLSGD34) { - Insn* iview = reinterpret_cast(view - d_offset); - Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); - insn &= (1 << 26) - (1 << 21); // extract rt - if (size == 32) - insn |= addis_0_2; - else - insn |= addis_0_13; - elfcpp::Swap<32, big_endian>::writeval(iview, insn); - r_type = elfcpp::R_POWERPC_TPREL16_HA; + Insn* iview = reinterpret_cast(view); + uint64_t pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + // pla pcrel -> paddi r13 + pinsn += (-1ULL << 52) + (13ULL << 16); + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + r_type = elfcpp::R_PPC64_TPREL34; value = psymval->value(object, rela.get_r_addend()); } else { - Insn* iview = reinterpret_cast(view - d_offset); - Insn insn = nop; - elfcpp::Swap<32, big_endian>::writeval(iview, insn); - r_type = elfcpp::R_POWERPC_NONE; + if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 + || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + insn &= (1 << 26) - (1 << 21); // extract rt + if (size == 32) + insn |= addis_0_2; + else + insn |= addis_0_13; + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + r_type = elfcpp::R_POWERPC_TPREL16_HA; + value = psymval->value(object, rela.get_r_addend()); + } + else + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = nop; + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + r_type = elfcpp::R_POWERPC_NONE; + } } } } else if (r_type == elfcpp::R_POWERPC_GOT_TLSLD16 || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_LO || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_HI - || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_HA) + || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_HA + || r_type == elfcpp::R_PPC64_GOT_TLSLD34) { // First instruction of a local dynamic sequence, arg setup insn. const tls::Tls_optimization tls_type = target->optimize_tls_ld(); if (tls_type == tls::TLSOPT_NONE) { value = target->tlsld_got_offset(); - value -= target->got_section()->got_base_offset(object); + if (r_type == elfcpp::R_PPC64_GOT_TLSLD34) + value += target->got_section()->address(); + else + value -= target->got_section()->got_base_offset(object); } else { gold_assert(tls_type == tls::TLSOPT_TO_LE); - if (r_type == elfcpp::R_POWERPC_GOT_TLSLD16 - || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_LO) + if (r_type == elfcpp::R_PPC64_GOT_TLSLD34) + { + Insn* iview = reinterpret_cast(view); + uint64_t pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + // pla pcrel -> paddi r13 + pinsn += (-1ULL << 52) + (13ULL << 16); + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + r_type = elfcpp::R_PPC64_TPREL34; + value = dtp_offset; + } + else if (r_type == elfcpp::R_POWERPC_GOT_TLSLD16 + || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_LO) { Insn* iview = reinterpret_cast(view - d_offset); Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); @@ -7373,7 +10410,8 @@ Target_powerpc::Relocate::relocate( else if (r_type == elfcpp::R_POWERPC_GOT_DTPREL16 || r_type == elfcpp::R_POWERPC_GOT_DTPREL16_LO || r_type == elfcpp::R_POWERPC_GOT_DTPREL16_HI - || r_type == elfcpp::R_POWERPC_GOT_DTPREL16_HA) + || r_type == elfcpp::R_POWERPC_GOT_DTPREL16_HA + || r_type == elfcpp::R_PPC64_GOT_DTPREL34) { // Accesses relative to a local dynamic sequence address, // no optimisation here. @@ -7384,16 +10422,19 @@ Target_powerpc::Relocate::relocate( } else { - unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_DTPREL)); value = object->local_got_offset(r_sym, GOT_TYPE_DTPREL); } - value -= target->got_section()->got_base_offset(object); + if (r_type == elfcpp::R_PPC64_GOT_DTPREL34) + value += target->got_section()->address(); + else + value -= target->got_section()->got_base_offset(object); } else if (r_type == elfcpp::R_POWERPC_GOT_TPREL16 || r_type == elfcpp::R_POWERPC_GOT_TPREL16_LO || r_type == elfcpp::R_POWERPC_GOT_TPREL16_HI - || r_type == elfcpp::R_POWERPC_GOT_TPREL16_HA) + || r_type == elfcpp::R_POWERPC_GOT_TPREL16_HA + || r_type == elfcpp::R_PPC64_GOT_TPREL34) { // First instruction of initial exec sequence. const bool final = gsym == NULL || gsym->final_value_is_known(); @@ -7407,17 +10448,34 @@ Target_powerpc::Relocate::relocate( } else { - unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_TPREL)); value = object->local_got_offset(r_sym, GOT_TYPE_TPREL); } - value -= target->got_section()->got_base_offset(object); + if (r_type == elfcpp::R_PPC64_GOT_TPREL34) + value += target->got_section()->address(); + else + value -= target->got_section()->got_base_offset(object); } else { gold_assert(tls_type == tls::TLSOPT_TO_LE); - if (r_type == elfcpp::R_POWERPC_GOT_TPREL16 - || r_type == elfcpp::R_POWERPC_GOT_TPREL16_LO) + if (r_type == elfcpp::R_PPC64_GOT_TPREL34) + { + Insn* iview = reinterpret_cast(view); + uint64_t pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + // pld ra,sym@got@tprel@pcrel -> paddi ra,r13,sym@tprel + pinsn += ((2ULL << 56) + (-1ULL << 52) + + (14ULL << 26) - (57ULL << 26) + (13ULL << 16)); + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + r_type = elfcpp::R_PPC64_TPREL34; + value = psymval->value(object, rela.get_r_addend()); + } + else if (r_type == elfcpp::R_POWERPC_GOT_TPREL16 + || r_type == elfcpp::R_POWERPC_GOT_TPREL16_LO) { Insn* iview = reinterpret_cast(view - d_offset); Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); @@ -7460,12 +10518,33 @@ Target_powerpc::Relocate::relocate( } else { + bool is_pcrel = false; + const int reloc_size = elfcpp::Elf_sizes::rela_size; + elfcpp::Shdr shdr(relinfo->reloc_shdr); + size_t reloc_count = shdr.get_sh_size() / reloc_size; + if (relnum < reloc_count - 1) + { + Reltype next_rela(preloc + reloc_size); + unsigned int r_type2 + = elfcpp::elf_r_type(next_rela.get_r_info()); + if ((r_type2 == elfcpp::R_PPC64_REL24_NOTOC + || r_type2 == elfcpp::R_PPC64_PLTCALL_NOTOC) + && next_rela.get_r_offset() == rela.get_r_offset()) + is_pcrel = true; + } Insn* iview = reinterpret_cast(view); - Insn insn = addi_3_3; - elfcpp::Swap<32, big_endian>::writeval(iview, insn); - r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += d_offset; - value = psymval->value(object, rela.get_r_addend()); + if (is_pcrel) + { + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + r_type = elfcpp::R_POWERPC_NONE; + } + else + { + elfcpp::Swap<32, big_endian>::writeval(iview, addi_3_3); + r_type = elfcpp::R_POWERPC_TPREL16_LO; + view += d_offset; + value = psymval->value(object, rela.get_r_addend()); + } } this->skip_next_tls_get_addr_call(); } @@ -7479,13 +10558,34 @@ Target_powerpc::Relocate::relocate( const tls::Tls_optimization tls_type = target->optimize_tls_ld(); if (tls_type == tls::TLSOPT_TO_LE) { + bool is_pcrel = false; + const int reloc_size = elfcpp::Elf_sizes::rela_size; + elfcpp::Shdr shdr(relinfo->reloc_shdr); + size_t reloc_count = shdr.get_sh_size() / reloc_size; + if (relnum < reloc_count - 1) + { + Reltype next_rela(preloc + reloc_size); + unsigned int r_type2 + = elfcpp::elf_r_type(next_rela.get_r_info()); + if ((r_type2 == elfcpp::R_PPC64_REL24_NOTOC + || r_type2 == elfcpp::R_PPC64_PLTCALL_NOTOC) + && next_rela.get_r_offset() == rela.get_r_offset()) + is_pcrel = true; + } Insn* iview = reinterpret_cast(view); - Insn insn = addi_3_3; - elfcpp::Swap<32, big_endian>::writeval(iview, insn); + if (is_pcrel) + { + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + r_type = elfcpp::R_POWERPC_NONE; + } + else + { + elfcpp::Swap<32, big_endian>::writeval(iview, addi_3_3); + r_type = elfcpp::R_POWERPC_TPREL16_LO; + view += d_offset; + value = dtp_offset; + } this->skip_next_tls_get_addr_call(); - r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += d_offset; - value = dtp_offset; } } else if (r_type == elfcpp::R_POWERPC_TLS) @@ -7495,24 +10595,68 @@ Target_powerpc::Relocate::relocate( const tls::Tls_optimization tls_type = target->optimize_tls_ie(final); if (tls_type == tls::TLSOPT_TO_LE) { - Insn* iview = reinterpret_cast(view); + Address roff = rela.get_r_offset() & 3; + Insn* iview = reinterpret_cast(view - roff); Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); unsigned int reg = size == 32 ? 2 : 13; insn = at_tls_transform(insn, reg); gold_assert(insn != 0); - elfcpp::Swap<32, big_endian>::writeval(iview, insn); - r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += d_offset; - value = psymval->value(object, rela.get_r_addend()); + if (roff == 0) + { + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + r_type = elfcpp::R_POWERPC_TPREL16_LO; + view += d_offset; + value = psymval->value(object, rela.get_r_addend()); + } + else if (roff == 1) + { + // For pcrel IE to LE we already have the full offset + // and thus don't need an addi here. A nop or mr will do. + if ((insn & (0x3f << 26)) == 14 << 26) + { + // Extract regs from addi rt,ra,si. + unsigned int rt = (insn >> 21) & 0x1f; + unsigned int ra = (insn >> 16) & 0x1f; + if (rt == ra) + insn = nop; + else + { + // Build or ra,rs,rb with rb==rs, ie. mr ra,rs. + insn = (rt << 16) | (ra << 21) | (ra << 11); + insn |= (31u << 26) | (444u << 1); + } + } + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + r_type = elfcpp::R_POWERPC_NONE; + } } } else if (!has_stub_value) { + if (!has_plt_offset && (r_type == elfcpp::R_POWERPC_PLTCALL + || r_type == elfcpp::R_PPC64_PLTCALL_NOTOC)) + { + // PLTCALL without plt entry => convert to direct call + Insn* iview = reinterpret_cast(view); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + insn = (insn & 1) | b; + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + if (size == 32) + r_type = elfcpp::R_PPC_PLTREL24; + else if (r_type == elfcpp::R_PPC64_PLTCALL_NOTOC) + r_type = elfcpp::R_PPC64_REL24_NOTOC; + else + r_type = elfcpp::R_POWERPC_REL24; + } Address addend = 0; - if (!(size == 32 && r_type == elfcpp::R_PPC_PLTREL24)) + if (!(size == 32 + && (r_type == elfcpp::R_PPC_PLTREL24 + || r_type == elfcpp::R_POWERPC_PLT16_LO + || r_type == elfcpp::R_POWERPC_PLT16_HI + || r_type == elfcpp::R_POWERPC_PLT16_HA))) addend = rela.get_r_addend(); value = psymval->value(object, addend); - if (size == 64 && is_branch_reloc(r_type)) + if (size == 64 && is_branch_reloc(r_type)) { if (target->abiversion() >= 2) { @@ -7528,19 +10672,29 @@ Target_powerpc::Relocate::relocate( &value, &dest_shndx); } } - Address max_branch_offset = max_branch_delta(r_type); + Address max_branch_offset = max_branch_delta(r_type); if (max_branch_offset != 0 - && value - address + max_branch_offset >= 2 * max_branch_offset) + && (value - address + max_branch_offset >= 2 * max_branch_offset + || (size == 64 + && r_type == elfcpp::R_PPC64_REL24_NOTOC + && (gsym != NULL + ? object->ppc64_needs_toc(gsym) + : object->ppc64_needs_toc(r_sym))))) { Stub_table* stub_table = object->stub_table(relinfo->data_shndx); if (stub_table != NULL) { - Address off = stub_table->find_long_branch_entry(object, value); - if (off != invalid_address) + const typename Stub_table::Branch_stub_ent* ent + = stub_table->find_long_branch_entry(object, value); + if (ent != NULL) { - value = (stub_table->stub_address() + stub_table->plt_size() - + off); + if (ent->save_res_) + value = (value - target->savres_section()->address() + + stub_table->branch_size()); + else + value = (stub_table->stub_address() + stub_table->plt_size() + + ent->off_); has_stub_value = true; } } @@ -7549,6 +10703,10 @@ Target_powerpc::Relocate::relocate( switch (r_type) { + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_PPC64_REL64: case elfcpp::R_POWERPC_REL32: case elfcpp::R_POWERPC_REL24: @@ -7559,9 +10717,28 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: case elfcpp::R_POWERPC_REL16DX_HA: + case elfcpp::R_PPC64_REL16_HIGH: + case elfcpp::R_PPC64_REL16_HIGHA: + case elfcpp::R_PPC64_REL16_HIGHER: + case elfcpp::R_PPC64_REL16_HIGHERA: + case elfcpp::R_PPC64_REL16_HIGHEST: + case elfcpp::R_PPC64_REL16_HIGHESTA: case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_GOT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_TPREL34: + case elfcpp::R_PPC64_GOT_DTPREL34: + case elfcpp::R_PPC64_REL16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: value -= address; break; @@ -7603,6 +10780,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TPREL16_HIGHERA: case elfcpp::R_PPC64_TPREL16_HIGHEST: case elfcpp::R_PPC64_TPREL16_HIGHESTA: + case elfcpp::R_PPC64_TPREL34: // tls symbol values are relative to tls_segment()->vaddr() value -= tp_offset; break; @@ -7625,6 +10803,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_DTPREL: case elfcpp::R_PPC64_DTPREL16_HIGH: case elfcpp::R_PPC64_DTPREL16_HIGHA: + case elfcpp::R_PPC64_DTPREL34: // tls symbol values are relative to tls_segment()->vaddr() value -= dtp_offset; break; @@ -7676,20 +10855,49 @@ Target_powerpc::Relocate::relocate( } break; + case elfcpp::R_POWERPC_PLT16_HA: + if (size == 32 + && !parameters->options().output_is_position_independent()) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + + // Convert addis to lis. + if ((insn & (0x3f << 26)) == 15u << 26 + && (insn & (0x1f << 16)) != 0) + { + insn &= ~(0x1f << 16); + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + } + } + break; + default: break; } - if (size == 64) + if (size == 64 + && (gsym + ? relative_value_is_known(gsym) + : relative_value_is_known(psymval))) { - // Multi-instruction sequences that access the TOC can be - // optimized, eg. addis ra,r2,0; addi rb,ra,x; - // to nop; addi rb,r2,x; + Insn* iview; + Insn* iview2; + Insn insn; + uint64_t pinsn, pinsn2; + switch (r_type) { default: break; + // Multi-instruction sequences that access the GOT/TOC can + // be optimized, eg. + // addis ra,r2,x@got@ha; ld rb,x@got@l(ra); + // to addis ra,r2,x@toc@ha; addi rb,ra,x@toc@l; + // and + // addis ra,r2,0; addi rb,ra,x@toc@l; + // to nop; addi rb,r2,x@toc; case elfcpp::R_POWERPC_GOT_TLSLD16_HA: case elfcpp::R_POWERPC_GOT_TLSGD16_HA: case elfcpp::R_POWERPC_GOT_TPREL16_HA: @@ -7698,14 +10906,21 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_HA: if (parameters->options().toc_optimize()) { - Insn* iview = reinterpret_cast(view - d_offset); - Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); - if ((insn & ((0x3f << 26) | 0x1f << 16)) - != ((15u << 26) | (2 << 16)) /* addis rt,2,imm */) - gold_error_at_location(relinfo, relnum, rela.get_r_offset(), - _("toc optimization is not supported " - "for %#08x instruction"), insn); - else if (value + 0x8000 < 0x10000) + iview = reinterpret_cast(view - d_offset); + insn = elfcpp::Swap<32, big_endian>::readval(iview); + if ((r_type == elfcpp::R_PPC64_TOC16_HA + && object->make_toc_relative(target, &value)) + || (r_type == elfcpp::R_POWERPC_GOT16_HA + && object->make_got_relative(target, psymval, + rela.get_r_addend(), + &value))) + { + gold_assert((insn & ((0x3f << 26) | 0x1f << 16)) + == ((15u << 26) | (2 << 16))); + } + if (((insn & ((0x3f << 26) | 0x1f << 16)) + == ((15u << 26) | (2 << 16)) /* addis rt,2,imm */) + && value + 0x8000 < 0x10000) { elfcpp::Swap<32, big_endian>::writeval(iview, nop); return true; @@ -7723,13 +10938,23 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_LO_DS: if (parameters->options().toc_optimize()) { - Insn* iview = reinterpret_cast(view - d_offset); - Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); - if (!ok_lo_toc_insn(insn)) - gold_error_at_location(relinfo, relnum, rela.get_r_offset(), - _("toc optimization is not supported " - "for %#08x instruction"), insn); - else if (value + 0x8000 < 0x10000) + iview = reinterpret_cast(view - d_offset); + insn = elfcpp::Swap<32, big_endian>::readval(iview); + bool changed = false; + if ((r_type == elfcpp::R_PPC64_TOC16_LO_DS + && object->make_toc_relative(target, &value)) + || (r_type == elfcpp::R_PPC64_GOT16_LO_DS + && object->make_got_relative(target, psymval, + rela.get_r_addend(), + &value))) + { + gold_assert ((insn & (0x3f << 26)) == 58u << 26 /* ld */); + insn ^= (14u << 26) ^ (58u << 26); + r_type = elfcpp::R_PPC64_TOC16_LO; + changed = true; + } + if (ok_lo_toc_insn(insn, r_type) + && value + 0x8000 < 0x10000) { if ((insn & (0x3f << 26)) == 12u << 26 /* addic */) { @@ -7742,11 +10967,116 @@ Target_powerpc::Relocate::relocate( insn &= ~(0x1f << 16); insn |= 2 << 16; } - elfcpp::Swap<32, big_endian>::writeval(iview, insn); + changed = true; + } + if (changed) + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + } + break; + + case elfcpp::R_PPC64_GOT_PCREL34: + if (parameters->options().toc_optimize()) + { + iview = reinterpret_cast(view); + pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + if ((pinsn & ((-1ULL << 50) | (63ULL << 26))) + != ((1ULL << 58) | (1ULL << 52) | (57ULL << 26) /* pld */)) + break; + + Address relval = psymval->value(object, rela.get_r_addend()); + relval -= address; + if (relval + (1ULL << 33) < 1ULL << 34) + { + value = relval; + // Replace with paddi + pinsn += (2ULL << 56) + (14ULL << 26) - (57ULL << 26); + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + goto pcrelopt; + } + } + break; + + case elfcpp::R_PPC64_PCREL34: + { + iview = reinterpret_cast(view); + pinsn = elfcpp::Swap<32, big_endian>::readval(iview); + pinsn <<= 32; + pinsn |= elfcpp::Swap<32, big_endian>::readval(iview + 1); + if ((pinsn & ((-1ULL << 50) | (63ULL << 26))) + != ((1ULL << 58) | (2ULL << 56) | (1ULL << 52) + | (14ULL << 26) /* paddi */)) + break; + + pcrelopt: + const int reloc_size = elfcpp::Elf_sizes::rela_size; + elfcpp::Shdr shdr(relinfo->reloc_shdr); + size_t reloc_count = shdr.get_sh_size() / reloc_size; + if (relnum >= reloc_count - 1) + break; + + Reltype next_rela(preloc + reloc_size); + if ((elfcpp::elf_r_type(next_rela.get_r_info()) + != elfcpp::R_PPC64_PCREL_OPT) + || next_rela.get_r_offset() != rela.get_r_offset()) + break; + + Address off = next_rela.get_r_addend(); + if (off == 0) + off = 8; // zero means next insn. + if (off + rela.get_r_offset() + 4 > view_size) + break; + + iview2 = reinterpret_cast(view + off); + pinsn2 = elfcpp::Swap<32, big_endian>::readval(iview2); + pinsn2 <<= 32; + if ((pinsn2 & (63ULL << 58)) == 1ULL << 58) + break; + if (xlate_pcrel_opt(&pinsn, &pinsn2)) + { + elfcpp::Swap<32, big_endian>::writeval(iview, pinsn >> 32); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, + pinsn & 0xffffffff); + elfcpp::Swap<32, big_endian>::writeval(iview2, pinsn2 >> 32); + } + } + break; + + case elfcpp::R_POWERPC_TPREL16_HA: + if (parameters->options().tls_optimize() && value + 0x8000 < 0x10000) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + if ((insn & ((0x3f << 26) | 0x1f << 16)) + != ((15u << 26) | ((size == 32 ? 2 : 13) << 16))) + ; + else + { + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + return true; } } break; + case elfcpp::R_PPC64_TPREL16_LO_DS: + if (size == 32) + // R_PPC_TLSGD, R_PPC_TLSLD + break; + // Fall through. + case elfcpp::R_POWERPC_TPREL16_LO: + if (parameters->options().tls_optimize() && value + 0x8000 < 0x10000) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + insn &= ~(0x1f << 16); + insn |= (size == 32 ? 2 : 13) << 16; + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + } + break; + case elfcpp::R_PPC64_ENTRY: value = (target->got_section()->output_section()->address() + object->toc_base_offset()); @@ -7798,7 +11128,7 @@ Target_powerpc::Relocate::relocate( // addi 2,2,.TOC.@l // if .TOC. is in range. */ if (value + address - 4 + 0x80008000 <= 0xffffffff - && relnum != 0 + && relnum + 1 > 1 && preloc != NULL && target->abiversion() >= 2 && !parameters->options().output_is_position_independent() @@ -7806,8 +11136,7 @@ Target_powerpc::Relocate::relocate( && gsym != NULL && strcmp(gsym->name(), ".TOC.") == 0) { - const int reloc_size - = Reloc_types::reloc_size; + const int reloc_size = elfcpp::Elf_sizes::rela_size; Reltype prev_rela(preloc - reloc_size); if ((prev_rela.get_r_info() == elfcpp::elf_r_info(r_sym, @@ -7913,6 +11242,10 @@ Target_powerpc::Relocate::relocate( overflow = Reloc::CHECK_LOW_INSN; break; + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + break; + // Fall through. case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_ADDR14: case elfcpp::R_POWERPC_ADDR14_BRTAKEN: @@ -7929,6 +11262,19 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_GOT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL28: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_TPREL34: + case elfcpp::R_PPC64_GOT_DTPREL34: overflow = Reloc::CHECK_SIGNED; break; } @@ -7964,6 +11310,11 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_TLS: case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: + case elfcpp::R_POWERPC_PLTSEQ: + case elfcpp::R_POWERPC_PLTCALL: + case elfcpp::R_PPC64_PLTSEQ_NOTOC: + case elfcpp::R_PPC64_PLTCALL_NOTOC: + case elfcpp::R_PPC64_PCREL_OPT: break; case elfcpp::R_PPC64_ADDR64: @@ -7994,6 +11345,10 @@ Target_powerpc::Relocate::relocate( status = Reloc::addr32_u(view, value, overflow); break; + case elfcpp::R_PPC64_REL24_NOTOC: + if (size == 32) + goto unsupp; // R_PPC_EMB_RELSDA + // Fall through. case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: @@ -8025,6 +11380,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_LO: case elfcpp::R_PPC64_TOC16_LO: case elfcpp::R_POWERPC_GOT16_LO: + case elfcpp::R_POWERPC_PLT16_LO: case elfcpp::R_POWERPC_SECTOFF_LO: case elfcpp::R_POWERPC_TPREL16_LO: case elfcpp::R_POWERPC_DTPREL16_LO: @@ -8049,8 +11405,10 @@ Target_powerpc::Relocate::relocate( // Fall through. case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_REL16_HI: + case elfcpp::R_PPC64_REL16_HIGH: case elfcpp::R_PPC64_TOC16_HI: case elfcpp::R_POWERPC_GOT16_HI: + case elfcpp::R_POWERPC_PLT16_HI: case elfcpp::R_POWERPC_SECTOFF_HI: case elfcpp::R_POWERPC_TPREL16_HI: case elfcpp::R_POWERPC_DTPREL16_HI: @@ -8070,8 +11428,10 @@ Target_powerpc::Relocate::relocate( // Fall through. case elfcpp::R_POWERPC_ADDR16_HA: case elfcpp::R_POWERPC_REL16_HA: + case elfcpp::R_PPC64_REL16_HIGHA: case elfcpp::R_PPC64_TOC16_HA: case elfcpp::R_POWERPC_GOT16_HA: + case elfcpp::R_POWERPC_PLT16_HA: case elfcpp::R_POWERPC_SECTOFF_HA: case elfcpp::R_POWERPC_TPREL16_HA: case elfcpp::R_POWERPC_DTPREL16_HA: @@ -8092,6 +11452,7 @@ Target_powerpc::Relocate::relocate( goto unsupp; // Fall through. case elfcpp::R_PPC64_ADDR16_HIGHER: + case elfcpp::R_PPC64_REL16_HIGHER: case elfcpp::R_PPC64_TPREL16_HIGHER: Reloc::addr16_hi2(view, value); break; @@ -8102,6 +11463,7 @@ Target_powerpc::Relocate::relocate( goto unsupp; // Fall through. case elfcpp::R_PPC64_ADDR16_HIGHERA: + case elfcpp::R_PPC64_REL16_HIGHERA: case elfcpp::R_PPC64_TPREL16_HIGHERA: Reloc::addr16_ha2(view, value); break; @@ -8112,6 +11474,7 @@ Target_powerpc::Relocate::relocate( goto unsupp; // Fall through. case elfcpp::R_PPC64_ADDR16_HIGHEST: + case elfcpp::R_PPC64_REL16_HIGHEST: case elfcpp::R_PPC64_TPREL16_HIGHEST: Reloc::addr16_hi3(view, value); break; @@ -8122,6 +11485,7 @@ Target_powerpc::Relocate::relocate( goto unsupp; // Fall through. case elfcpp::R_PPC64_ADDR16_HIGHESTA: + case elfcpp::R_PPC64_REL16_HIGHESTA: case elfcpp::R_PPC64_TPREL16_HIGHESTA: Reloc::addr16_ha3(view, value); break; @@ -8144,6 +11508,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_LO_DS: case elfcpp::R_PPC64_GOT16_DS: case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_PLT16_LO_DS: case elfcpp::R_PPC64_SECTOFF_DS: case elfcpp::R_PPC64_SECTOFF_LO_DS: maybe_dq_reloc = true; @@ -8170,12 +11535,26 @@ Target_powerpc::Relocate::relocate( r_type); break; - case elfcpp::R_PPC_EMB_SDA21: + case elfcpp::R_PPC64_TOCSAVE: if (size == 32) + // R_PPC_EMB_SDA21 goto unsupp; else { - // R_PPC64_TOCSAVE. For the time being this can be ignored. + Symbol_location loc; + loc.object = relinfo->object; + loc.shndx = relinfo->data_shndx; + loc.offset = rela.get_r_offset(); + Tocsave_loc::const_iterator p = target->tocsave_loc().find(loc); + if (p != target->tocsave_loc().end()) + { + // If we've generated plt calls using this tocsave, then + // the nop needs to be changed to save r2. + Insn* iview = reinterpret_cast(view); + if (elfcpp::Swap<32, big_endian>::readval(iview) == nop) + elfcpp::Swap<32, big_endian>:: + writeval(iview, std_2_1 + target->stk_toc()); + } } break; @@ -8186,11 +11565,72 @@ Target_powerpc::Relocate::relocate( // R_PPC64_TLSGD, R_PPC64_TLSLD break; + case elfcpp::R_PPC64_D34: + case elfcpp::R_PPC64_D34_LO: + case elfcpp::R_PPC64_PCREL34: + case elfcpp::R_PPC64_GOT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + case elfcpp::R_PPC64_TPREL34: + case elfcpp::R_PPC64_DTPREL34: + case elfcpp::R_PPC64_GOT_TLSGD34: + case elfcpp::R_PPC64_GOT_TLSLD34: + case elfcpp::R_PPC64_GOT_TPREL34: + case elfcpp::R_PPC64_GOT_DTPREL34: + if (size == 32) + goto unsupp; + status = Reloc::addr34(view, value, overflow); + break; + + case elfcpp::R_PPC64_D34_HI30: + if (size == 32) + goto unsupp; + Reloc::addr34_hi(view, value); + break; + + case elfcpp::R_PPC64_D34_HA30: + if (size == 32) + goto unsupp; + Reloc::addr34_ha(view, value); + break; + + case elfcpp::R_PPC64_D28: + case elfcpp::R_PPC64_PCREL28: + if (size == 32) + goto unsupp; + status = Reloc::addr28(view, value, overflow); + break; + + case elfcpp::R_PPC64_ADDR16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHER34: + if (size == 32) + goto unsupp; + Reloc::addr16_higher34(view, value); + break; + + case elfcpp::R_PPC64_ADDR16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + if (size == 32) + goto unsupp; + Reloc::addr16_highera34(view, value); + break; + + case elfcpp::R_PPC64_ADDR16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + if (size == 32) + goto unsupp; + Reloc::addr16_highest34(view, value); + break; + + case elfcpp::R_PPC64_ADDR16_HIGHESTA34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: + if (size == 32) + goto unsupp; + Reloc::addr16_highesta34(view, value); + break; + case elfcpp::R_POWERPC_PLT32: case elfcpp::R_POWERPC_PLTREL32: - case elfcpp::R_POWERPC_PLT16_LO: - case elfcpp::R_POWERPC_PLT16_HI: - case elfcpp::R_POWERPC_PLT16_HA: case elfcpp::R_PPC_SDAREL16: case elfcpp::R_POWERPC_ADDR30: case elfcpp::R_PPC64_PLT64: @@ -8199,10 +11639,8 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_PLTGOT16_LO: case elfcpp::R_PPC64_PLTGOT16_HI: case elfcpp::R_PPC64_PLTGOT16_HA: - case elfcpp::R_PPC64_PLT16_LO_DS: case elfcpp::R_PPC64_PLTGOT16_DS: case elfcpp::R_PPC64_PLTGOT16_LO_DS: - case elfcpp::R_PPC_EMB_RELSDA: case elfcpp::R_PPC_TOC16: default: unsupp: @@ -8235,7 +11673,7 @@ Target_powerpc::Relocate::relocate( && (has_stub_value || !(gsym != NULL && gsym->is_undefined() - && is_branch_reloc(r_type)))) + && is_branch_reloc(r_type)))) { gold_error_at_location(relinfo, relnum, rela.get_r_offset(), _("relocation overflow")); @@ -8289,10 +11727,8 @@ template class Powerpc_scan_relocatable_reloc { public: - typedef typename Reloc_types::Reloc - Reltype; - static const int reloc_size = - Reloc_types::reloc_size; + typedef typename elfcpp::Rela Reltype; + static const int reloc_size = elfcpp::Elf_sizes::rela_size; static const int sh_type = elfcpp::SHT_RELA; // Return the symbol referred to by the relocation. @@ -8328,7 +11764,11 @@ public: inline Relocatable_relocs::Reloc_strategy global_strategy(unsigned int r_type, Relobj*, unsigned int) { - if (r_type == elfcpp::R_PPC_PLTREL24) + if (size == 32 + && (r_type == elfcpp::R_PPC_PLTREL24 + || r_type == elfcpp::R_POWERPC_PLT16_LO + || r_type == elfcpp::R_POWERPC_PLT16_HI + || r_type == elfcpp::R_POWERPC_PLT16_HA)) return Relocatable_relocs::RELOC_SPECIAL; return Relocatable_relocs::RELOC_COPY; } @@ -8432,12 +11872,9 @@ Target_powerpc::relocate_relocs( { gold_assert(sh_type == elfcpp::SHT_RELA); - typedef typename Reloc_types::Reloc - Reltype; - typedef typename Reloc_types::Reloc_write - Reltype_write; - const int reloc_size - = Reloc_types::reloc_size; + typedef typename elfcpp::Rela Reltype; + typedef typename elfcpp::Rela_write Reltype_write; + const int reloc_size = elfcpp::Elf_sizes::rela_size; // Offset from start of insn to d-field reloc. const int d_offset = big_endian ? 2 : 0; @@ -8452,6 +11889,8 @@ Target_powerpc::relocate_relocs( gold_assert(got2_addend != invalid_address); } + const bool relocatable = parameters->options().relocatable(); + unsigned char* pwrite = reloc_view; bool zap_next = false; for (size_t i = 0; i < reloc_count; ++i, prelocs += reloc_size) @@ -8547,7 +11986,7 @@ Target_powerpc::relocate_relocs( // In an object file, r_offset is an offset within the section. // In an executable or dynamic object, generated by // --emit-relocs, r_offset is an absolute address. - if (!parameters->options().relocatable()) + if (!relocatable) { offset += view_address; if (static_cast
(offset_in_output_section) != invalid_address) @@ -8560,8 +11999,15 @@ Target_powerpc::relocate_relocs( else if (strategy == Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_RELA) { const Symbol_value* psymval = object->local_symbol(orig_r_sym); - gold_assert(os != NULL); - addend = psymval->value(object, addend) - os->address(); + addend = psymval->value(object, addend); + // In a relocatable link, the symbol value is relative to + // the start of the output section. For a non-relocatable + // link, we need to adjust the addend. + if (!relocatable) + { + gold_assert(os != NULL); + addend -= os->address(); + } } else if (strategy == Relocatable_relocs::RELOC_SPECIAL) { @@ -8584,7 +12030,7 @@ Target_powerpc::relocate_relocs( else gold_unreachable(); - if (!parameters->options().relocatable()) + if (!relocatable) { if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO @@ -8738,9 +12184,10 @@ Target_powerpc::do_dynsym_value(const Symbol* gsym) const p != this->stub_tables_.end(); ++p) { - Address off = (*p)->find_plt_call_entry(gsym); - if (off != invalid_address) - return (*p)->stub_address() + off; + const typename Stub_table::Plt_stub_ent* ent + = (*p)->find_plt_call_entry(gsym); + if (ent != NULL) + return (*p)->stub_address() + ent->off_; } } else if (this->abiversion() >= 2) @@ -8767,10 +12214,10 @@ Target_powerpc::do_plt_address_for_local( p != this->stub_tables_.end(); ++p) { - Address off = (*p)->find_plt_call_entry(relobj->sized_relobj(), - symndx); - if (off != invalid_address) - return (*p)->stub_address() + off; + const typename Stub_table::Plt_stub_ent* ent + = (*p)->find_plt_call_entry(relobj->sized_relobj(), symndx); + if (ent != NULL) + return (*p)->stub_address() + ent->off_; } } gold_unreachable(); @@ -8788,9 +12235,10 @@ Target_powerpc::do_plt_address_for_global( p != this->stub_tables_.end(); ++p) { - Address off = (*p)->find_plt_call_entry(gsym); - if (off != invalid_address) - return (*p)->stub_address() + off; + const typename Stub_table::Plt_stub_ent* ent + = (*p)->find_plt_call_entry(gsym); + if (ent != NULL) + return (*p)->stub_address() + ent->off_; } } else if (this->abiversion() >= 2) @@ -8894,8 +12342,6 @@ Target_selector_powerpc<64, false> target_selector_ppc64le; // Instantiate these constants for -O0 template -const int Output_data_glink::pltresolve_size; -template const typename Output_data_glink::Address Output_data_glink::invalid_address; template