X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fpowerpc.cc;h=c8d4414df7184a13f5ed8f339786f4a8eeb1e06f;hb=e4dff7651becba48d805e39655138f7f6ca30485;hp=4deb5afbb4b308c3c1323b2729a008543836b3a9;hpb=e3ee8ed41b6a4365897d776cc181a1bd813010c6;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 4deb5afbb4..c8d4414df7 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -1,6 +1,6 @@ // powerpc.cc -- powerpc target support for gold. -// Copyright (C) 2008-2015 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 { @@ -62,17 +63,30 @@ class Output_data_glink; template class Stub_table; +template +class Output_data_save_res; + template class Target_powerpc; struct Stub_table_owner { + Stub_table_owner() + : output_section(NULL), owner(NULL) + { } + Output_section* output_section; 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 @@ -85,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 @@ -181,6 +243,12 @@ 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); + // Perform the Sized_relobj_file method, then set up opd info from // .opd relocs. void @@ -212,7 +280,7 @@ public: // Add a reference from SRC_OBJ, SRC_INDX to this object's .opd // section at DST_OFF. void - add_reference(Object* src_obj, + add_reference(Relobj* src_obj, unsigned int src_indx, typename elfcpp::Elf_types::Elf_Addr dst_off) { @@ -238,7 +306,7 @@ public: if (this->opd_ent_[i].gc_mark) { unsigned int shndx = this->opd_ent_[i].shndx; - symtab->gc()->worklist().push(Section_id(this, shndx)); + symtab->gc()->worklist().push_back(Section_id(this, shndx)); } } @@ -272,7 +340,7 @@ public: set_stub_table(unsigned int shndx, unsigned int stub_index) { if (shndx >= this->stub_table_index_.size()) - this->stub_table_index_.resize(shndx + 1); + this->stub_table_index_.resize(shndx + 1, -1); this->stub_table_index_[shndx] = stub_index; } @@ -285,8 +353,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; } @@ -297,6 +365,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; } @@ -305,6 +377,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); } @@ -313,6 +391,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 { @@ -336,9 +427,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_; @@ -350,6 +448,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 @@ -367,11 +472,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 @@ -383,13 +488,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, @@ -448,6 +554,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 @@ -480,14 +591,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 @@ -498,6 +629,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; @@ -505,12 +637,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) + 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) { } @@ -585,6 +723,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*); @@ -624,6 +795,14 @@ class Target_powerpc : public Sized_target do_can_check_for_function_pointers() const { return true; } + // Adjust -fsplit-stack code which calls non-split-stack code. + void + do_calls_non_split(Relobj* object, unsigned int shndx, + section_offset_type fnoffset, section_size_type fnsize, + const unsigned char* prelocs, size_t reloc_count, + unsigned char* view, section_size_type view_size, + std::string* from, std::string* to) const; + // Relocate a section. void relocate_section(const Relocate_info*, @@ -652,6 +831,21 @@ class Target_powerpc : public Sized_target const unsigned char* plocal_symbols, Relocatable_relocs*); + // Scan the relocs for --emit-relocs. + void + emit_relocs_scan(Symbol_table* symtab, + Layout* layout, + Sized_relobj_file* object, + unsigned int data_shndx, + unsigned int sh_type, + const unsigned char* prelocs, + size_t reloc_count, + Output_section* output_section, + bool needs_special_offset_handling, + size_t local_symbol_count, + const unsigned char* plocal_syms, + Relocatable_relocs* rr); + // Emit relocations for a section. void relocate_relocs(const Relocate_info*, @@ -661,7 +855,6 @@ class Target_powerpc : public Sized_target Output_section* output_section, typename elfcpp::Elf_types::Elf_Off offset_in_output_section, - const Relocatable_relocs*, unsigned char*, Address view_address, section_size_type, @@ -699,6 +892,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 @@ -768,6 +995,12 @@ class Target_powerpc : public Sized_target return 24; } + Output_data_save_res* + savres_section() const + { + return this->savres_section_; + } + // Add any special sections for this symbol to the gc work list. // For powerpc64, this adds the code section of a function // descriptor. @@ -780,9 +1013,9 @@ class Target_powerpc : public Sized_target // section of a function descriptor. void do_gc_add_reference(Symbol_table* symtab, - Object* src_obj, + Relobj* src_obj, unsigned int src_shndx, - Object* dst_obj, + Relobj* dst_obj, unsigned int dst_shndx, Address dst_off) const; @@ -822,16 +1055,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; @@ -839,11 +1159,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 @@ -858,13 +1214,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(); } @@ -882,7 +1238,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; @@ -890,21 +1246,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) @@ -920,14 +1287,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_; @@ -986,7 +1353,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 @@ -1007,7 +1374,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 @@ -1056,13 +1423,10 @@ class Target_powerpc : public Sized_target // Do a relocation. Return false if the caller should not issue // any warnings about this relocation. inline bool - relocate(const Relocate_info*, Target_powerpc*, - Output_section*, size_t relnum, - const elfcpp::Rela&, - unsigned int r_type, const Sized_symbol*, - const Symbol_value*, - unsigned char*, - typename elfcpp::Elf_types::Elf_Addr, + relocate(const Relocate_info*, unsigned int, + Target_powerpc*, Output_section*, size_t, const unsigned char*, + const Sized_symbol*, const Symbol_value*, + unsigned char*, typename elfcpp::Elf_types::Elf_Addr, section_size_type); }; @@ -1076,7 +1440,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 @@ -1092,19 +1456,6 @@ class Target_powerpc : public Sized_target } }; - // A class which returns the size required for a relocation type, - // used while scanning relocs during a relocatable link. - class Relocatable_size_for_reloc - { - public: - unsigned int - get_size_for_reloc(unsigned int, Relobj*) - { - gold_unreachable(); - return 0; - } - }; - // Optimize the TLS relocation type based on what we know about the // symbol. IS_FINAL is true if the final address of this symbol is // known at link time. @@ -1114,7 +1465,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) @@ -1125,7 +1477,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; @@ -1134,7 +1487,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; @@ -1151,6 +1506,9 @@ class Target_powerpc : public Sized_target void make_iplt_section(Symbol_table*, Layout*); + void + make_lplt_section(Layout*); + void make_brlt_section(Layout*); @@ -1164,6 +1522,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 @@ -1191,10 +1555,13 @@ class Target_powerpc : public Sized_target unsigned int shndx, Output_section* output_section, Symbol* sym, const elfcpp::Rela& reloc) { + unsigned int r_type = elfcpp::elf_r_type(reloc.get_r_info()); this->copy_relocs_.copy_reloc(symtab, layout, symtab->get_sized_symbol(sym), object, shndx, output_section, - reloc, this->rela_dyn_section(layout)); + r_type, reloc.get_r_offset(), + reloc.get_r_addend(), + this->rela_dyn_section(layout)); } // Look over all the input sections, deciding where to place stubs. @@ -1219,12 +1586,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*, @@ -1237,7 +1611,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_; }; @@ -1285,6 +1660,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. @@ -1292,7 +1669,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_; @@ -1302,12 +1679,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<> @@ -1334,7 +1733,9 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info = 0, // large_common_section_flags NULL, // attributes_section NULL, // attributes_vendor - "_start" // entry_symbol_name + "_start", // entry_symbol_name + 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1361,7 +1762,9 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info = 0, // large_common_section_flags NULL, // attributes_section NULL, // attributes_vendor - "_start" // entry_symbol_name + "_start", // entry_symbol_name + 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1371,9 +1774,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 @@ -1388,7 +1791,9 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info = 0, // large_common_section_flags NULL, // attributes_section NULL, // attributes_vendor - "_start" // entry_symbol_name + "_start", // entry_symbol_name + 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1398,9 +1803,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 @@ -1415,13 +1820,17 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info = 0, // large_common_section_flags NULL, // attributes_section NULL, // attributes_vendor - "_start" // entry_symbol_name + "_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 @@ -1433,6 +1842,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. @@ -1495,6 +1915,7 @@ public: private: typedef Powerpc_relocate_functions This; typedef typename elfcpp::Elf_types::Elf_Addr Address; + typedef typename elfcpp::Elf_types::Elf_Swxword SignedAddress; template static inline bool @@ -1650,7 +2071,17 @@ public: addr16_ds(unsigned char* view, Address value, Overflow_check overflow) { Status stat = This::template rela<16,16>(view, 0, 0xfffc, value, overflow); - if (overflow != CHECK_NONE && (value & 3) != 0) + if ((value & 3) != 0) + stat = STATUS_OVERFLOW; + return stat; + } + + // R_POWERPC_ADDR16_DQ: (Symbol + Addend) & 0xfff0 + static inline Status + addr16_dq(unsigned char* view, Address value, Overflow_check overflow) + { + Status stat = This::template rela<16,16>(view, 0, 0xfff0, value, overflow); + if ((value & 15) != 0) stat = STATUS_OVERFLOW; return stat; } @@ -1694,6 +2125,70 @@ public: stat = STATUS_OVERFLOW; return stat; } + + // R_POWERPC_REL16DX_HA + static inline Status + addr16dx_ha(unsigned char *view, Address value, Overflow_check overflow) + { + typedef typename elfcpp::Swap<32, big_endian>::Valtype Valtype; + Valtype* wv = reinterpret_cast(view); + Valtype val = elfcpp::Swap<32, big_endian>::readval(wv); + value += 0x8000; + value = static_cast(value) >> 16; + val |= (value & 0xffc1) | ((value & 0x3e) << 15); + 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. @@ -1719,8 +2214,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 @@ -1749,6 +2244,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); } @@ -1763,10 +2270,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; @@ -1831,6 +2336,60 @@ 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; +} + +// 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) @@ -1865,6 +2424,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; @@ -1898,18 +2459,68 @@ Powerpc_relobj::do_read_symbols(Read_symbols_data* sd) } } } -} -template -void -Powerpc_dynobj::set_abiversion(int ver) -{ - this->e_flags_ |= ver; - if (this->abiversion() != 0) + 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) { - Target_powerpc* target = - static_cast*>( - parameters->sized_target()); + 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 +void +Powerpc_dynobj::set_abiversion(int ver) +{ + this->e_flags_ |= ver; + if (this->abiversion() != 0) + { + Target_powerpc* target = + static_cast*>( + parameters->sized_target()); if (target->abiversion() == 0) target->set_abiversion(this->abiversion()); else if (target->abiversion() != this->abiversion()) @@ -1929,9 +2540,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); @@ -2026,6 +2654,60 @@ Powerpc_dynobj::do_read_symbols(Read_symbols_data* sd) } } +// Relocate sections. + +template +void +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 @@ -2094,6 +2776,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. @@ -2142,7 +2854,10 @@ public: symtab_(symtab), layout_(layout), header_ent_cnt_(size == 32 ? 3 : 1), header_index_(size == 32 ? 0x2000 : 0) - { } + { + if (size == 64) + this->set_addralign(256); + } // Override all the Output_data_got methods we use so as to first call // reserve_ent(). @@ -2178,6 +2893,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); @@ -2209,6 +2927,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); @@ -2383,14 +3104,13 @@ class Stub_control public: // Determine the stub group size. The group size is the absolute // value of the parameter --stub-group-size. If --stub-group-size - // is passed a negative value, we restrict stubs to be always before + // is passed a negative value, we restrict stubs to be always after // the stubbed branches. - Stub_control(int32_t size, bool no_size_errors) - : state_(NO_GROUP), stub_group_size_(abs(size)), - stub14_group_size_(abs(size) >> 10), - stubs_always_before_branch_(size < 0), - suppress_size_errors_(no_size_errors), - group_end_addr_(0), owner_(NULL), output_section_(NULL) + Stub_control(int32_t size, bool no_size_errors, bool multi_os) + : stub_group_size_(abs(size)), stubs_always_after_branch_(size < 0), + suppress_size_errors_(no_size_errors), multi_os_(multi_os), + state_(NO_GROUP), group_size_(0), group_start_addr_(0), + owner_(NULL), output_section_(NULL) { } @@ -2420,31 +3140,40 @@ class Stub_control private: typedef enum { + // Initial state. NO_GROUP, + // Adding group sections before the stubs. FINDING_STUB_SECTION, + // Adding group sections after the stubs. HAS_STUB_SECTION } State; - State state_; uint32_t stub_group_size_; - uint32_t stub14_group_size_; - bool stubs_always_before_branch_; + bool stubs_always_after_branch_; bool suppress_size_errors_; - uint64_t group_end_addr_; + // True if a stub group can serve multiple output sections. + bool multi_os_; + State state_; + // Current max size of group. Starts at stub_group_size_ but is + // reduced to stub_group_size_/1024 on seeing a section with + // external conditional branches. + uint32_t group_size_; + uint64_t group_start_addr_; + // owner_ and output_section_ specify the section to which stubs are + // attached. The stubs are placed at the end of this section. const Output_section::Input_section* owner_; Output_section* output_section_; }; // Return true iff input section can be handled by current stub -// group. +// group. Sections are presented to this function in order, +// so the first section is the head of the group. bool Stub_control::can_add_to_stub_group(Output_section* o, const Output_section::Input_section* i, bool has14) { - uint32_t group_size - = has14 ? this->stub14_group_size_ : this->stub_group_size_; bool whole_sec = o->order() == ORDER_INIT || o->order() == ORDER_FINI; uint64_t this_size; uint64_t start_addr = o->address(); @@ -2458,46 +3187,88 @@ Stub_control::can_add_to_stub_group(Output_section* o, start_addr += i->relobj()->output_section_offset(i->shndx()); this_size = i->data_size(); } + uint64_t end_addr = start_addr + this_size; - bool toobig = this_size > group_size; + uint32_t group_size = this->stub_group_size_; + if (has14) + this->group_size_ = group_size = group_size >> 10; - if (toobig && !this->suppress_size_errors_) + if (this_size > group_size && !this->suppress_size_errors_) gold_warning(_("%s:%s exceeds group size"), i->relobj()->name().c_str(), i->relobj()->section_name(i->shndx()).c_str()); - if (this->state_ != HAS_STUB_SECTION - && (!whole_sec || this->output_section_ != o) - && (this->state_ == NO_GROUP - || this->group_end_addr_ - end_addr < group_size)) - { - this->owner_ = i; - this->output_section_ = o; - } + gold_debug(DEBUG_TARGET, "maybe add%s %s:%s size=%#llx total=%#llx", + has14 ? " 14bit" : "", + i->relobj()->name().c_str(), + i->relobj()->section_name(i->shndx()).c_str(), + (long long) this_size, + (this->state_ == NO_GROUP + ? this_size + : (long long) end_addr - this->group_start_addr_)); if (this->state_ == NO_GROUP) { + // Only here on very first use of Stub_control + this->owner_ = i; + this->output_section_ = o; this->state_ = FINDING_STUB_SECTION; - this->group_end_addr_ = end_addr; + this->group_size_ = group_size; + this->group_start_addr_ = start_addr; + return true; } - else if (this->group_end_addr_ - start_addr < group_size) + else if (!this->multi_os_ && this->output_section_ != o) ; - // Adding this section would make the group larger than GROUP_SIZE. - else if (this->state_ == FINDING_STUB_SECTION - && !this->stubs_always_before_branch_ - && !toobig) + else if (this->state_ == HAS_STUB_SECTION) { - // But wait, there's more! Input sections up to GROUP_SIZE - // bytes before the stub table can be handled by it too. - this->state_ = HAS_STUB_SECTION; - this->group_end_addr_ = end_addr; + // Can we add this section, which is after the stubs, to the + // group? + if (end_addr - this->group_start_addr_ <= this->group_size_) + return true; } - else + else if (this->state_ == FINDING_STUB_SECTION) { - this->state_ = NO_GROUP; - return false; + if ((whole_sec && this->output_section_ == o) + || end_addr - this->group_start_addr_ <= this->group_size_) + { + // Stubs are added at the end of "owner_". + this->owner_ = i; + this->output_section_ = o; + return true; + } + // The group before the stubs has reached maximum size. + // Now see about adding sections after the stubs to the + // group. If the current section has a 14-bit branch and + // the group before the stubs exceeds group_size_ (because + // they didn't have 14-bit branches), don't add sections + // after the stubs: The size of stubs for such a large + // group may exceed the reach of a 14-bit branch. + if (!this->stubs_always_after_branch_ + && this_size <= this->group_size_ + && start_addr - this->group_start_addr_ <= this->group_size_) + { + gold_debug(DEBUG_TARGET, "adding after stubs"); + this->state_ = HAS_STUB_SECTION; + this->group_start_addr_ = start_addr; + return true; + } } - return true; + else + gold_unreachable(); + + gold_debug(DEBUG_TARGET, + !this->multi_os_ && this->output_section_ != o + ? "nope, new output section\n" + : "nope, didn't fit\n"); + + // The section fails to fit in the current group. Set up a few + // things for the next group. owner_ and output_section_ will be + // set later after we've retrieved those values for the current + // group. + this->state_ = FINDING_STUB_SECTION; + this->group_size_ = group_size; + this->group_start_addr_ = start_addr; + return false; } // Look over all the input sections, deciding where to place stubs. @@ -2508,7 +3279,8 @@ Target_powerpc::group_sections(Layout* layout, const Task*, bool no_size_errors) { - Stub_control stub_control(this->stub_group_size_, no_size_errors); + Stub_control stub_control(this->stub_group_size_, no_size_errors, + parameters->options().stub_group_multi()); // Group input sections and insert stub table Stub_table_owner* table_owner = NULL; @@ -2516,14 +3288,14 @@ Target_powerpc::group_sections(Layout* layout, Layout::Section_list section_list; layout->get_executable_sections(§ion_list); std::stable_sort(section_list.begin(), section_list.end(), Sort_sections()); - for (Layout::Section_list::reverse_iterator o = section_list.rbegin(); - o != section_list.rend(); + for (Layout::Section_list::iterator o = section_list.begin(); + o != section_list.end(); ++o) { typedef Output_section::Input_section_list Input_section_list; - for (Input_section_list::const_reverse_iterator i - = (*o)->input_sections().rbegin(); - i != (*o)->input_sections().rend(); + for (Input_section_list::const_iterator i + = (*o)->input_sections().begin(); + i != (*o)->input_sections().end(); ++i) { if (i->is_input_section() @@ -2550,26 +3322,8 @@ Target_powerpc::group_sections(Layout* layout, } if (table_owner != NULL) { - const Output_section::Input_section* i = stub_control.owner(); - - if (tables.size() >= 2 && tables[tables.size() - 2]->owner == i) - { - // Corner case. A new stub group was made for the first - // section (last one looked at here) for some reason, but - // the first section is already being used as the owner for - // a stub table for following sections. Force it into that - // stub group. - tables.pop_back(); - delete table_owner; - Powerpc_relobj* ppcobj = static_cast - *>(i->relobj()); - ppcobj->set_stub_table(i->shndx(), tables.size() - 1); - } - else - { - table_owner->output_section = stub_control.output_section(); - table_owner->owner = i; - } + table_owner->output_section = stub_control.output_section(); + table_owner->owner = stub_control.owner();; } for (typename std::vector::iterator t = tables.begin(); t != tables.end(); @@ -2580,7 +3334,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()); @@ -2591,6 +3346,7 @@ Target_powerpc::group_sections(Layout* layout, } } +template static unsigned long max_branch_delta (unsigned int r_type) { @@ -2599,12 +3355,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 @@ -2615,12 +3406,16 @@ 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 ? gsym->use_plt_offset(Scan::get_reference_flags(this->r_type_, target)) : this->object_->local_has_plt_offset(this->r_sym_)) @@ -2629,15 +3424,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); @@ -2646,18 +3447,20 @@ Target_powerpc::Branch_info::make_stub( from += (this->object_->output_section(this->shndx_)->address() + this->offset_); if (gsym != NULL) - return stub_table->add_plt_call_entry(from, - this->object_, gsym, - this->r_type_, this->addend_); + ok = stub_table->add_plt_call_entry(from, + this->object_, gsym, + this->r_type_, this->addend_, + this->tocsave_); else - return stub_table->add_plt_call_entry(from, - this->object_, this->r_sym_, - this->r_type_, this->addend_); + ok = stub_table->add_plt_call_entry(from, + this->object_, this->r_sym_, + 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_); @@ -2700,6 +3503,8 @@ Target_powerpc::Branch_info::make_stub( const Symbol_value* psymval = this->object_->local_symbol(this->r_sym_); Symbol_value symval; + if (psymval->is_section_symbol()) + symval.set_is_section_symbol(); typedef Sized_relobj_file ObjType; typename ObjType::Compute_final_local_value_status status = this->object_->compute_final_local_value(this->r_sym_, psymval, @@ -2723,7 +3528,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) { @@ -2733,11 +3543,26 @@ Target_powerpc::Branch_info::make_stub( this->object_->section_name(this->shndx_).c_str()); return true; } - return stub_table->add_long_branch_entry(this->object_, - this->r_type_, from, to); + bool save_res = (size == 64 + && gsym != NULL + && gsym->source() == Symbol::IN_OUTPUT_DATA + && gsym->output_data() == target->savres_section()); + ok = stub_table->add_long_branch_entry(this->object_, + this->r_type_, + from, to, save_res); } } - return true; + if (!ok) + gold_debug(DEBUG_TARGET, + "branch at %s:%s+%#lx\n" + "can't reach stub attached to %s:%s", + this->object_->name().c_str(), + this->object_->section_name(this->shndx_).c_str(), + (unsigned long) this->offset_, + stub_table->relobj()->name().c_str(), + stub_table->relobj()->section_name(stub_table->shndx()).c_str()); + + return ok; } // Relaxation hook. This is where we do stub generation. @@ -2830,7 +3655,7 @@ Target_powerpc::do_relax(int pass, } this->stub_tables_.clear(); this->stub_group_size_ = this->stub_group_size_ / 4 * 3; - gold_info(_("%s: stub group size is too large; retrying with %d"), + gold_info(_("%s: stub group size is too large; retrying with %#x"), program_name, this->stub_group_size_); this->group_sections(layout, task, true); } @@ -2880,6 +3705,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(); @@ -2889,6 +3748,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(); @@ -2898,7 +3767,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()); } } @@ -2925,7 +3793,13 @@ Target_powerpc::do_relax(int pass, Stub_table* stub_table = static_cast*>( i->relaxed_input_section()); - off += stub_table->set_address_and_size(os, off); + Address stub_table_size = stub_table->set_address_and_size(os, off); + off += stub_table_size; + // After a few iterations, set current stub table size + // as min size threshold, so later stub tables can only + // grow in size. + if (pass >= 4) + stub_table->set_min_size_threshold(stub_table_size); } else off += i->data_size(); @@ -2951,6 +3825,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; } @@ -2992,7 +3896,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 @@ -3041,6 +3945,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); @@ -3078,8 +3985,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(); } @@ -3142,6 +4049,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 @@ -3166,29 +4098,43 @@ Output_data_plt_powerpc::add_local_ifunc_entry( static const uint32_t add_0_11_11 = 0x7c0b5a14; 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; +static const uint32_t addis_2_12 = 0x3c4c0000; static const uint32_t addis_11_2 = 0x3d620000; 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; @@ -3196,37 +4142,55 @@ static const uint32_t ld_0_12 = 0xe80c0000; 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_0 = 0x3c000000; +static const uint32_t lis_0 = 0x3c000000; +static const uint32_t lis_2 = 0x3c400000; 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; @@ -3234,13 +4198,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 @@ -3302,6 +4270,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()); } } @@ -3315,13 +4286,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); } } @@ -3372,8 +4380,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(); @@ -3416,27 +4423,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); } } @@ -3476,6 +4482,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 { @@ -3504,7 +4522,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 }; @@ -3516,7 +4534,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 }; @@ -3549,6 +4567,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 @@ -3558,19 +4585,46 @@ 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())), targ_(targ), plt_call_stubs_(), long_branch_stubs_(), orig_data_size_(owner->current_data_size()), plt_size_(0), last_plt_size_(0), - branch_size_(0), last_branch_size_(0), eh_frame_added_(false) + branch_size_(0), last_branch_size_(0), min_size_threshold_(0), + need_save_res_(false), need_resize_(false), resizing_(false), + uniq_(id) { this->set_output_section(output_section); @@ -3585,30 +4639,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, @@ -3617,16 +4673,16 @@ class Stub_table : public Output_relaxed_input_section // Add a long branch stub. bool add_long_branch_entry(const Powerpc_relobj*, - unsigned int, Address, Address); + 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); @@ -3641,6 +4697,7 @@ class Stub_table : public Output_relaxed_input_section this->plt_size_ = 0; this->long_branch_stubs_.clear(); this->branch_size_ = 0; + this->need_save_res_ = false; if (all) { this->last_plt_size_ = 0; @@ -3648,16 +4705,40 @@ 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) { Address start_off = off; off += this->orig_data_size_; Address my_size = this->plt_size_ + this->branch_size_; + if (this->need_save_res_) + my_size += this->targ_->savres_section()->data_size(); if (my_size != 0) off = align_address(off, this->stub_align()); // Include original section size and alignment padding in size my_size += off - start_off; + // Ensure new size is always larger than min size + // threshold. Alignment requirement is included in "my_size", so + // increase "my_size" does not invalidate alignment. + if (my_size < this->min_size_threshold_) + my_size = this->min_size_threshold_; this->reset_address_and_file_offset(); this->set_current_data_size(my_size); this->set_address_and_file_offset(os->address() + start_off, @@ -3683,6 +4764,17 @@ class Stub_table : public Output_relaxed_input_section plt_size() const { return this->plt_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() { @@ -3714,141 +4806,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) @@ -3857,7 +4906,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) @@ -3865,7 +4915,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) @@ -3874,11 +4924,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_ @@ -3892,10 +4943,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_) @@ -3905,17 +4956,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) + 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 @@ -3926,11 +4977,11 @@ class Stub_table : public Output_relaxed_input_section unsigned int toc_base_off_; }; - 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. @@ -3938,15 +4989,27 @@ 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_; // size of stubs section_size_type plt_size_, last_plt_size_, branch_size_, last_branch_size_; - // Whether .eh_frame info has been created for this stub section. - bool eh_frame_added_; + // Some rare cases cause (PR/20529) fluctuation in stub table + // size, which leads to an endless relax loop. This is to be fixed + // by, after the first few iterations, allowing only increase of + // stub table size. This variable sets the minimal possible size of + // a stub table, it is zero for the first few iterations, then + // increases monotonically. + Address min_size_threshold_; + // 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 @@ -3959,15 +5022,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 @@ -3977,63 +5073,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 @@ -4045,32 +5180,224 @@ Stub_table::add_long_branch_entry( const Powerpc_relobj* object, unsigned int r_type, Address from, - Address to) + Address to, + bool save_res) { - Branch_stub_ent ent(object, to); - 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_)) { - unsigned int stub_size = this->branch_stub_size(to); - this->branch_size_ = off + stub_size; - if (size == 64 && stub_size != 4) - this->targ_->add_branch_lookup_table(to); + if (this->resizing_) + { + p.first->second.iter_ = 1; + p.first->second.off_ = this->branch_size_; + } + if (save_res) + this->need_save_res_ = true; + else + { + 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. +// 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); + Branch_stub_key key(object, to); typename Branch_stub_entries::const_iterator p - = this->long_branch_stubs_.find(ent); - return p == this->long_branch_stubs_.end() ? invalid_address : p->second; + = this->long_branch_stubs_.find(key); + if (p == this->long_branch_stubs_.end()) + return NULL; + return &p->second; +} + +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 +static bool +stub_sort(T s1, T s2) +{ + 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. @@ -4081,7 +5408,6 @@ 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_(), @@ -4097,12 +5423,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: @@ -4174,10 +5521,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 @@ -4204,11 +5552,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; @@ -4221,10 +5569,500 @@ 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); + 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. @@ -4244,50 +6082,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_) + { + write_insn(p, std_2_1 + this->targ_->stk_toc()); + p += 4; + } + if (cs->second.notoc_) { - if (iplt_base == invalid_address) - iplt_base = this->targ_->iplt_section()->address(); - plt_addr += iplt_base; + 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) @@ -4296,14 +6232,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); @@ -4311,60 +6248,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)); - p += 4; - write_insn(p, ld_12_12 + l(off)); + write_insn(p, xor_2_12_12); p += 4; - } - if (plt_load_toc - && ha(off + 8 + 8 * static_chain) != ha(off)) - { - write_insn(p, addi_11_11 + l(off)); + write_insn(p, add_11_11_2); 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; @@ -4372,25 +6297,24 @@ Stub_table::do_write(Output_file* of) } write_insn(p, mtctr_12); p += 4; - if (plt_load_toc) + if (use_fake_dep) { - 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, 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)); + 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; @@ -4409,12 +6333,19 @@ Stub_table::do_write(Output_file* of) bs != this->long_branch_stubs_.end(); ++bs) { - p = oview + this->plt_size_ + bs->second; - Address loc = this->stub_address() + this->plt_size_ + bs->second; + 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 (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_); @@ -4424,25 +6355,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; @@ -4452,18 +6389,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; @@ -4491,26 +6422,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); } } @@ -4520,32 +6449,47 @@ Stub_table::do_write(Output_file* of) bs != this->long_branch_stubs_.end(); ++bs) { - p = oview + this->plt_size_ + bs->second; - Address loc = this->stub_address() + this->plt_size_ + bs->second; + 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 (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_) + { + p = oview + this->plt_size_ + this->branch_size_; + memcpy (p, this->targ_->savres_section()->contents(), + this->targ_->savres_section()->data_size()); + } } // Write out .glink. @@ -4593,6 +6537,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; @@ -4604,8 +6549,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; @@ -4619,7 +6563,7 @@ Output_data_glink::do_write(Output_file* of) } else { - write_insn(p, lis_0_0 + hi(indx)), p += 4; + write_insn(p, lis_0 + hi(indx)), p += 4; write_insn(p, ori_0_0_0 + l(indx)), p += 4; } } @@ -4631,7 +6575,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(); @@ -4653,8 +6597,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; @@ -4672,7 +6615,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; @@ -4680,68 +6623,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); @@ -4756,6 +6716,12 @@ class Output_data_save_res : public Output_section_data_build public: Output_data_save_res(Symbol_table* symtab); + const unsigned char* + contents() const + { + return contents_; + } + protected: // Write to a map file. void @@ -5115,6 +7081,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 @@ -5209,9 +7189,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: @@ -5226,14 +7222,20 @@ 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: - // Absolute in GOT. - ref = Symbol::ABSOLUTE_REF; + 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: @@ -5414,9 +7416,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: @@ -5447,6 +7468,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 @@ -5463,7 +7523,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)) @@ -5509,8 +7569,31 @@ 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: + break; + + 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: + target->set_powerxx_stubs(); break; case elfcpp::R_PPC64_TOC: @@ -5602,6 +7685,25 @@ Target_powerpc::Scan::local( } break; + case elfcpp::R_PPC64_PLT_PCREL34: + case elfcpp::R_PPC64_PLT_PCREL34_NOTOC: + target->set_powerxx_stubs(); + // Fall through. + 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: @@ -5609,9 +7711,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: @@ -5620,6 +7745,13 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_REL16_LO: 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: @@ -5655,6 +7787,9 @@ Target_powerpc::Scan::local( case elfcpp::R_PPC64_ADDR64_LOCAL: break; + case elfcpp::R_PPC64_GOT_PCREL34: + target->set_powerxx_stubs(); + // Fall through. case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: case elfcpp::R_POWERPC_GOT16_HI: @@ -5793,9 +7928,153 @@ Target_powerpc::Scan::local( } break; - default: - unsupported_reloc_local(object, r_type); - break; + default: + unsupported_reloc_local(object, r_type); + 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) @@ -5842,9 +8121,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)) { @@ -5871,9 +8156,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; } @@ -5885,6 +8170,30 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_GNU_VTENTRY: 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: + break; + + 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: + target->set_powerxx_stubs(); break; case elfcpp::R_PPC64_TOC: @@ -5923,7 +8232,7 @@ Target_powerpc::Scan::global( ppc_object->set_opd_discard(reloc.get_r_offset()); break; } - // Fall thru + // Fall through. case elfcpp::R_PPC64_UADDR64: case elfcpp::R_POWERPC_ADDR32: case elfcpp::R_POWERPC_UADDR32: @@ -5962,9 +8271,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); } @@ -6010,19 +8319,39 @@ 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: + target->set_powerxx_stubs(); + // Fall through. + 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() @@ -6030,7 +8359,7 @@ Target_powerpc::Scan::global( || gsym->is_preemptible()))) target->make_plt_entry(symtab, layout, gsym); } - // Fall thru + // Fall through. case elfcpp::R_PPC64_REL64: case elfcpp::R_POWERPC_REL32: @@ -6060,15 +8389,47 @@ 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: case elfcpp::R_POWERPC_REL16_LO: 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: @@ -6104,6 +8465,9 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC64_ADDR64_LOCAL: break; + case elfcpp::R_PPC64_GOT_PCREL34: + target->set_powerxx_stubs(); + // Fall through. case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: case elfcpp::R_POWERPC_GOT16_HI: @@ -6296,6 +8660,136 @@ Target_powerpc::Scan::global( 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) { case elfcpp::R_POWERPC_GOT_TLSLD16: @@ -6330,7 +8824,9 @@ Target_powerpc::gc_process_relocs( const unsigned char* plocal_symbols) { typedef Target_powerpc Powerpc; - typedef typename Target_powerpc::Scan Scan; + typedef gold::Default_classify_reloc + Classify_reloc; + Powerpc_relobj* ppc_object = static_cast*>(object); if (size == 64) @@ -6347,7 +8843,7 @@ Target_powerpc::gc_process_relocs( typename Powerpc_relobj::Section_refs::iterator s; for (s = p->second.begin(); s != p->second.end(); ++s) { - Object* src_obj = s->first; + Relobj* src_obj = s->first; unsigned int src_indx = s->second; symtab->gc()->add_reference(src_obj, src_indx, ppc_object, dst_indx); @@ -6360,8 +8856,7 @@ Target_powerpc::gc_process_relocs( return; } - gold::gc_process_relocs( + gold::gc_process_relocs( symtab, layout, this, @@ -6384,9 +8879,9 @@ template void Target_powerpc::do_gc_add_reference( Symbol_table* symtab, - Object* src_obj, + Relobj* src_obj, unsigned int src_shndx, - Object* dst_obj, + Relobj* dst_obj, unsigned int dst_shndx, Address dst_off) const { @@ -6434,7 +8929,8 @@ Target_powerpc::do_gc_mark_symbol( if (ppc_object->opd_valid()) { unsigned int dst_indx = ppc_object->get_opd_ent(dst_off); - symtab->gc()->worklist().push(Section_id(ppc_object, dst_indx)); + symtab->gc()->worklist().push_back(Section_id(ppc_object, + dst_indx)); } else ppc_object->add_gc_mark(dst_off); @@ -6478,6 +8974,116 @@ Target_powerpc::do_function_location( } } +// FNOFFSET in section SHNDX in OBJECT is the start of a function +// compiled with -fsplit-stack. The function calls non-split-stack +// code. Change the function to ensure it has enough stack space to +// call some random function. + +template +void +Target_powerpc::do_calls_non_split( + Relobj* object, + unsigned int shndx, + section_offset_type fnoffset, + section_size_type fnsize, + const unsigned char* prelocs, + size_t reloc_count, + unsigned char* view, + section_size_type view_size, + std::string* from, + std::string* to) const +{ + // 32-bit not supported. + if (size == 32) + { + // warn + Target::do_calls_non_split(object, shndx, fnoffset, fnsize, + prelocs, reloc_count, view, view_size, + from, to); + return; + } + + // The function always starts with + // ld %r0,-0x7000-64(%r13) # tcbhead_t.__private_ss + // addis %r12,%r1,-allocate@ha + // addi %r12,%r12,-allocate@l + // cmpld %r12,%r0 + // but note that the addis or addi may be replaced with a nop + + unsigned char *entry = view + fnoffset; + uint32_t insn = elfcpp::Swap<32, big_endian>::readval(entry); + + if ((insn & 0xffff0000) == addis_2_12) + { + /* Skip ELFv2 global entry code. */ + entry += 8; + insn = elfcpp::Swap<32, big_endian>::readval(entry); + } + + unsigned char *pinsn = entry; + bool ok = false; + const uint32_t ld_private_ss = 0xe80d8fc0; + if (insn == ld_private_ss) + { + int32_t allocate = 0; + while (1) + { + pinsn += 4; + insn = elfcpp::Swap<32, big_endian>::readval(pinsn); + if ((insn & 0xffff0000) == addis_12_1) + allocate += (insn & 0xffff) << 16; + else if ((insn & 0xffff0000) == addi_12_1 + || (insn & 0xffff0000) == addi_12_12) + allocate += ((insn & 0xffff) ^ 0x8000) - 0x8000; + else if (insn != nop) + break; + } + if (insn == cmpld_7_12_0 && pinsn == entry + 12) + { + int extra = parameters->options().split_stack_adjust_size(); + allocate -= extra; + if (allocate >= 0 || extra < 0) + { + object->error(_("split-stack stack size overflow at " + "section %u offset %0zx"), + shndx, static_cast(fnoffset)); + return; + } + pinsn = entry + 4; + insn = addis_12_1 | (((allocate + 0x8000) >> 16) & 0xffff); + if (insn != addis_12_1) + { + elfcpp::Swap<32, big_endian>::writeval(pinsn, insn); + pinsn += 4; + insn = addi_12_12 | (allocate & 0xffff); + if (insn != addi_12_12) + { + elfcpp::Swap<32, big_endian>::writeval(pinsn, insn); + pinsn += 4; + } + } + else + { + insn = addi_12_1 | (allocate & 0xffff); + elfcpp::Swap<32, big_endian>::writeval(pinsn, insn); + pinsn += 4; + } + if (pinsn != entry + 12) + elfcpp::Swap<32, big_endian>::writeval(pinsn, nop); + + ok = true; + } + } + + if (!ok) + { + if (!object->has_no_split_stack()) + object->error(_("failed to match split-stack sequence at " + "section %u offset %0zx"), + shndx, static_cast(fnoffset)); + } +} + // Scan relocations for a section. template @@ -6496,7 +9102,25 @@ Target_powerpc::scan_relocs( const unsigned char* plocal_symbols) { typedef Target_powerpc Powerpc; - typedef typename Target_powerpc::Scan Scan; + 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) { @@ -6505,7 +9129,7 @@ Target_powerpc::scan_relocs( return; } - gold::scan_relocs( + gold::scan_relocs( symtab, layout, this, @@ -6566,8 +9190,9 @@ Target_powerpc::define_save_restore_funcs( { if (size == 64) { - Output_data_save_res<64, big_endian>* savres - = new Output_data_save_res<64, big_endian>(symtab); + Output_data_save_res* savres + = new Output_data_save_res(symtab); + this->savres_section_ = savres; layout->add_output_section_data(".text", elfcpp::SHT_PROGBITS, elfcpp::SHF_ALLOC | elfcpp::SHF_EXECINSTR, savres, ORDER_TEXT, false); @@ -6605,7 +9230,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()) @@ -6682,6 +9307,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 { @@ -6690,9 +9317,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))); } } @@ -6700,33 +9333,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 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) { - 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 */); + 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. @@ -6748,7 +9627,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()); @@ -6786,21 +9666,30 @@ template inline bool Target_powerpc::Relocate::relocate( const Relocate_info* relinfo, + unsigned int, Target_powerpc* target, Output_section* os, size_t relnum, - const elfcpp::Rela& rela, - unsigned int r_type, + const unsigned char* preloc, const Sized_symbol* gsym, const Symbol_value* psymval, unsigned char* view, 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; - switch (this->maybe_skip_tls_get_addr_call(r_type, gsym)) + 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(target, r_type, gsym)) { case Track_tls::NOT_EXPECTED: gold_error_at_location(relinfo, relnum, rela.get_r_offset(), @@ -6810,21 +9699,51 @@ 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; + // Offset from start of insn to d-field reloc. + const int d_offset = big_endian ? 2 : 0; + Powerpc_relobj* const object = 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))) { @@ -6832,42 +9751,131 @@ 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)) { - unsigned int off = target->glink_section()->find_global_entry(gsym); - gold_assert(off != (unsigned int)-1); - value = target->glink_section()->global_entry_address() + off; + Address off = target->glink_section()->find_global_entry(gsym); + if (off != invalid_address) + { + value = target->glink_section()->global_entry_address() + off; + has_stub_value = true; + } } 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]; } - gold_assert(stub_table != NULL); - Address off; - if (gsym != NULL) - off = 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, - rela.get_r_addend()); - gold_assert(off != invalid_address); - value = stub_table->stub_address() + off; + if (stub_table != NULL) + { + const typename Stub_table::Plt_stub_ent* ent; + if (gsym != NULL) + ent = stub_table->find_plt_call_entry(object, gsym, r_type, + rela.get_r_addend()); + else + ent = stub_table->find_plt_call_entry(object, r_sym, r_type, + rela.get_r_addend()); + if (ent != NULL) + { + 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; + } + } } - has_stub_value = true; + // We don't care too much about bogus debug references to + // non-local functions, but otherwise there had better be a plt + // call stub or global entry stub as appropriate. + 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) { @@ -6876,11 +9884,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) { @@ -6896,8 +9906,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); @@ -6978,7 +9988,6 @@ 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); } @@ -6989,7 +9998,7 @@ Target_powerpc::Relocate::relocate( if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + 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) @@ -7006,7 +10015,7 @@ Target_powerpc::Relocate::relocate( if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + 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) @@ -7019,7 +10028,7 @@ Target_powerpc::Relocate::relocate( } else { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn* iview = reinterpret_cast(view - d_offset); Insn insn = nop; elfcpp::Swap<32, big_endian>::writeval(iview, insn); r_type = elfcpp::R_POWERPC_NONE; @@ -7044,7 +10053,7 @@ Target_powerpc::Relocate::relocate( if (r_type == elfcpp::R_POWERPC_GOT_TLSLD16 || r_type == elfcpp::R_POWERPC_GOT_TLSLD16_LO) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + 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) @@ -7057,7 +10066,7 @@ Target_powerpc::Relocate::relocate( } else { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn* iview = reinterpret_cast(view - d_offset); Insn insn = nop; elfcpp::Swap<32, big_endian>::writeval(iview, insn); r_type = elfcpp::R_POWERPC_NONE; @@ -7078,7 +10087,6 @@ 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); } @@ -7101,7 +10109,6 @@ 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); } @@ -7113,7 +10120,7 @@ Target_powerpc::Relocate::relocate( if (r_type == elfcpp::R_POWERPC_GOT_TPREL16 || r_type == elfcpp::R_POWERPC_GOT_TPREL16_LO) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn* iview = reinterpret_cast(view - d_offset); Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); insn &= (1 << 26) - (1 << 21); // extract rt from ld if (size == 32) @@ -7126,7 +10133,7 @@ Target_powerpc::Relocate::relocate( } else { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn* iview = reinterpret_cast(view - d_offset); Insn insn = nop; elfcpp::Swap<32, big_endian>::writeval(iview, insn); r_type = elfcpp::R_POWERPC_NONE; @@ -7158,7 +10165,7 @@ Target_powerpc::Relocate::relocate( Insn insn = addi_3_3; elfcpp::Swap<32, big_endian>::writeval(iview, insn); r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += 2 * big_endian; + view += d_offset; value = psymval->value(object, rela.get_r_addend()); } this->skip_next_tls_get_addr_call(); @@ -7178,7 +10185,7 @@ Target_powerpc::Relocate::relocate( elfcpp::Swap<32, big_endian>::writeval(iview, insn); this->skip_next_tls_get_addr_call(); r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += 2 * big_endian; + view += d_offset; value = dtp_offset; } } @@ -7196,17 +10203,36 @@ Target_powerpc::Relocate::relocate( gold_assert(insn != 0); elfcpp::Swap<32, big_endian>::writeval(iview, insn); r_type = elfcpp::R_POWERPC_TPREL16_LO; - view += 2 * big_endian; + view += d_offset; value = psymval->value(object, rela.get_r_addend()); } } 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) { @@ -7222,19 +10248,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; } } @@ -7243,6 +10279,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: @@ -7252,9 +10292,25 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_LO: 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_REL16_HIGHER34: + case elfcpp::R_PPC64_REL16_HIGHERA34: + case elfcpp::R_PPC64_REL16_HIGHEST34: + case elfcpp::R_PPC64_REL16_HIGHESTA34: value -= address; break; @@ -7286,6 +10342,7 @@ Target_powerpc::Relocate::relocate( if (size != 64) // R_PPC_TLSGD, R_PPC_TLSLD, R_PPC_EMB_RELST_LO, R_PPC_EMB_RELST_HI break; + // Fall through. case elfcpp::R_POWERPC_TPREL16: case elfcpp::R_POWERPC_TPREL16_LO: case elfcpp::R_POWERPC_TPREL16_HI: @@ -7309,6 +10366,7 @@ Target_powerpc::Relocate::relocate( // R_PPC_EMB_NADDR32, R_PPC_EMB_NADDR16, R_PPC_EMB_NADDR16_LO // R_PPC_EMB_NADDR16_HI, R_PPC_EMB_NADDR16_HA, R_PPC_EMB_SDAI16 break; + // Fall through. case elfcpp::R_POWERPC_DTPREL16: case elfcpp::R_POWERPC_DTPREL16_LO: case elfcpp::R_POWERPC_DTPREL16_HI: @@ -7337,6 +10395,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_ADDR14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRTAKEN: branch_bit = 1 << 21; + // Fall through. case elfcpp::R_POWERPC_ADDR14_BRNTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: { @@ -7366,20 +10425,47 @@ 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) { - // 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; 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; + // FIXME: the @got sequence shown above is not yet + // optimized. Note that gcc as of 2017-01-07 doesn't use + // the ELF @got relocs except for TLS, instead using the + // PowerOpen variant of a compiler managed GOT (called TOC). + // The PowerOpen TOC sequence equivalent to the first + // example is optimized. case elfcpp::R_POWERPC_GOT_TLSLD16_HA: case elfcpp::R_POWERPC_GOT_TLSGD16_HA: case elfcpp::R_POWERPC_GOT_TPREL16_HA: @@ -7388,14 +10474,17 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_HA: if (parameters->options().toc_optimize()) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + 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) + if (r_type == elfcpp::R_PPC64_TOC16_HA + && object->make_toc_relative(target, &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; @@ -7413,13 +10502,19 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_LO_DS: if (parameters->options().toc_optimize()) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); + 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) + bool changed = false; + if (r_type == elfcpp::R_PPC64_TOC16_LO_DS + && object->make_toc_relative(target, &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 */) { @@ -7432,7 +10527,132 @@ 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_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()); + if (value + 0x80008000 <= 0xffffffff + && !parameters->options().output_is_position_independent()) + { + Insn* iview = reinterpret_cast(view); + Insn insn1 = elfcpp::Swap<32, big_endian>::readval(iview); + Insn insn2 = elfcpp::Swap<32, big_endian>::readval(iview + 1); + + if ((insn1 & ~0xfffc) == ld_2_12 + && insn2 == add_2_2_12) + { + insn1 = lis_2 + ha(value); + elfcpp::Swap<32, big_endian>::writeval(iview, insn1); + insn2 = addi_2_2 + l(value); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, insn2); + return true; + } + } + else + { + value -= address; + if (value + 0x80008000 <= 0xffffffff) + { + Insn* iview = reinterpret_cast(view); + Insn insn1 = elfcpp::Swap<32, big_endian>::readval(iview); + Insn insn2 = elfcpp::Swap<32, big_endian>::readval(iview + 1); + + if ((insn1 & ~0xfffc) == ld_2_12 + && insn2 == add_2_2_12) + { + insn1 = addis_2_12 + ha(value); + elfcpp::Swap<32, big_endian>::writeval(iview, insn1); + insn2 = addi_2_2 + l(value); + elfcpp::Swap<32, big_endian>::writeval(iview + 1, insn2); + return true; + } + } + } + break; + + case elfcpp::R_POWERPC_REL16_LO: + // If we are generating a non-PIC executable, edit + // 0: addis 2,12,.TOC.-0b@ha + // addi 2,2,.TOC.-0b@l + // used by ELFv2 global entry points to set up r2, to + // lis 2,.TOC.@ha + // addi 2,2,.TOC.@l + // if .TOC. is in range. */ + if (value + address - 4 + 0x80008000 <= 0xffffffff + && relnum + 1 > 1 + && preloc != NULL + && target->abiversion() >= 2 + && !parameters->options().output_is_position_independent() + && rela.get_r_addend() == d_offset + 4 + && gsym != NULL + && strcmp(gsym->name(), ".TOC.") == 0) + { + 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, + elfcpp::R_POWERPC_REL16_HA)) + && prev_rela.get_r_offset() + 4 == rela.get_r_offset() + && prev_rela.get_r_addend() + 4 == rela.get_r_addend()) + { + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn1 = elfcpp::Swap<32, big_endian>::readval(iview - 1); + Insn insn2 = elfcpp::Swap<32, big_endian>::readval(iview); + + if ((insn1 & 0xffff0000) == addis_2_12 + && (insn2 & 0xffff0000) == addi_2_2) + { + insn1 = lis_2 + ha(value + address - 4); + elfcpp::Swap<32, big_endian>::writeval(iview - 1, insn1); + insn2 = addi_2_2 + l(value + address - 4); + elfcpp::Swap<32, big_endian>::writeval(iview, insn2); + if (relinfo->rr) + { + relinfo->rr->set_strategy(relnum - 1, + Relocatable_relocs::RELOC_SPECIAL); + relinfo->rr->set_strategy(relnum, + Relocatable_relocs::RELOC_SPECIAL); + } + return true; + } } } break; @@ -7450,6 +10670,7 @@ Target_powerpc::Relocate::relocate( break; case elfcpp::R_POWERPC_REL32: + case elfcpp::R_POWERPC_REL16DX_HA: if (size == 64) overflow = Reloc::CHECK_SIGNED; break; @@ -7510,6 +10731,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: @@ -7526,15 +10751,24 @@ 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: overflow = Reloc::CHECK_SIGNED; break; } + Insn* iview = reinterpret_cast(view - d_offset); + Insn insn = 0; + if (overflow == Reloc::CHECK_LOW_INSN || overflow == Reloc::CHECK_HIGH_INSN) { - Insn* iview = reinterpret_cast(view - 2 * big_endian); - Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + insn = elfcpp::Swap<32, big_endian>::readval(iview); if ((insn & (0x3f << 26)) == 10u << 26 /* cmpli */) overflow = Reloc::CHECK_BITFIELD; @@ -7550,6 +10784,7 @@ Target_powerpc::Relocate::relocate( overflow = Reloc::CHECK_SIGNED; } + bool maybe_dq_reloc = false; typename Powerpc_relocate_functions::Status status = Powerpc_relocate_functions::STATUS_OK; switch (r_type) @@ -7558,6 +10793,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: @@ -7588,6 +10828,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: @@ -7597,11 +10841,15 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_GOT_DTPREL16: case elfcpp::R_POWERPC_GOT_DTPREL16_LO: + case elfcpp::R_POWERPC_GOT_TPREL16: + case elfcpp::R_POWERPC_GOT_TPREL16_LO: if (size == 64) { - status = Reloc::addr16_ds(view, value, overflow); + // On ppc64 these are all ds form + maybe_dq_reloc = true; break; } + // Fall through. case elfcpp::R_POWERPC_ADDR16: case elfcpp::R_POWERPC_REL16: case elfcpp::R_PPC64_TOC16: @@ -7611,18 +10859,20 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_DTPREL16: case elfcpp::R_POWERPC_GOT_TLSGD16: case elfcpp::R_POWERPC_GOT_TLSLD16: - case elfcpp::R_POWERPC_GOT_TPREL16: case elfcpp::R_POWERPC_ADDR16_LO: 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: case elfcpp::R_POWERPC_GOT_TLSGD16_LO: case elfcpp::R_POWERPC_GOT_TLSLD16_LO: - case elfcpp::R_POWERPC_GOT_TPREL16_LO: - status = Reloc::addr16(view, value, overflow); + if (size == 64) + status = Reloc::addr16(view, value, overflow); + else + maybe_dq_reloc = true; break; case elfcpp::R_POWERPC_UADDR16: @@ -7635,10 +10885,13 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_MRKREF, R_PPC_EMB_RELST_LO, R_PPC_EMB_RELST_HA goto unsupp; + // 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: @@ -7655,10 +10908,13 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_RELSEC16, R_PPC_EMB_RELST_HI, R_PPC_EMB_BIT_FLD goto unsupp; + // 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: @@ -7669,11 +10925,17 @@ Target_powerpc::Relocate::relocate( Reloc::addr16_ha(view, value); break; + case elfcpp::R_POWERPC_REL16DX_HA: + status = Reloc::addr16dx_ha(view, value, overflow); + break; + case elfcpp::R_PPC64_DTPREL16_HIGHER: if (size == 32) // R_PPC_EMB_NADDR16_LO 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; @@ -7682,7 +10944,9 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_NADDR16_HI 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; @@ -7691,7 +10955,9 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_NADDR16_HA 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; @@ -7700,7 +10966,9 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_SDAI16 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; @@ -7710,20 +10978,23 @@ Target_powerpc::Relocate::relocate( if (size == 32) // R_PPC_EMB_NADDR32, R_PPC_EMB_NADDR16 goto unsupp; + // Fall through. case elfcpp::R_PPC64_TPREL16_DS: case elfcpp::R_PPC64_TPREL16_LO_DS: if (size == 32) // R_PPC_TLSGD, R_PPC_TLSLD break; + // Fall through. case elfcpp::R_PPC64_ADDR16_DS: case elfcpp::R_PPC64_ADDR16_LO_DS: case elfcpp::R_PPC64_TOC16_DS: 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: - status = Reloc::addr16_ds(view, value, overflow); + maybe_dq_reloc = true; break; case elfcpp::R_POWERPC_ADDR14: @@ -7747,12 +11018,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; @@ -7763,11 +11048,66 @@ 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: + 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: @@ -7776,10 +11116,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: @@ -7788,11 +11126,31 @@ Target_powerpc::Relocate::relocate( r_type); break; } + + if (maybe_dq_reloc) + { + if (insn == 0) + insn = elfcpp::Swap<32, big_endian>::readval(iview); + + if ((insn & (0x3f << 26)) == 56u << 26 /* lq */ + || ((insn & (0x3f << 26)) == (61u << 26) /* lxv, stxv */ + && (insn & 3) == 1)) + status = Reloc::addr16_dq(view, value, overflow); + else if (size == 64 + || (insn & (0x3f << 26)) == 58u << 26 /* ld,ldu,lwa */ + || (insn & (0x3f << 26)) == 62u << 26 /* std,stdu,stq */ + || (insn & (0x3f << 26)) == 57u << 26 /* lfdp */ + || (insn & (0x3f << 26)) == 61u << 26 /* stfdp */) + status = Reloc::addr16_ds(view, value, overflow); + else + status = Reloc::addr16(view, value, overflow); + } + if (status != Powerpc_relocate_functions::STATUS_OK && (has_stub_value || !(gsym != NULL - && gsym->is_weak_undefined() - && is_branch_reloc(r_type)))) + && gsym->is_undefined() + && is_branch_reloc(r_type)))) { gold_error_at_location(relinfo, relnum, rela.get_r_offset(), _("relocation overflow")); @@ -7823,11 +11181,13 @@ Target_powerpc::relocate_section( typedef typename Target_powerpc::Relocate Powerpc_relocate; typedef typename Target_powerpc::Relocate_comdat_behavior Powerpc_comdat_behavior; + typedef gold::Default_classify_reloc + Classify_reloc; gold_assert(sh_type == elfcpp::SHT_RELA); - gold::relocate_section( + gold::relocate_section( relinfo, this, prelocs, @@ -7840,9 +11200,24 @@ Target_powerpc::relocate_section( reloc_symbol_changes); } +template class Powerpc_scan_relocatable_reloc { public: + 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. + static inline unsigned int + get_r_sym(const Reltype* reloc) + { return elfcpp::elf_r_sym(reloc->get_r_info()); } + + // Return the type of the relocation. + static inline unsigned int + get_r_type(const Reltype* reloc) + { return elfcpp::elf_r_type(reloc->get_r_info()); } + // Return the strategy to use for a local symbol which is not a // section symbol, given the relocation type. inline Relocatable_relocs::Reloc_strategy @@ -7866,7 +11241,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; } @@ -7890,10 +11269,11 @@ Target_powerpc::scan_relocatable_relocs( const unsigned char* plocal_symbols, Relocatable_relocs* rr) { + typedef Powerpc_scan_relocatable_reloc Scan_strategy; + gold_assert(sh_type == elfcpp::SHT_RELA); - gold::scan_relocatable_relocs( + gold::scan_relocatable_relocs( symtab, layout, object, @@ -7907,6 +11287,45 @@ Target_powerpc::scan_relocatable_relocs( rr); } +// Scan the relocs for --emit-relocs. + +template +void +Target_powerpc::emit_relocs_scan( + Symbol_table* symtab, + Layout* layout, + Sized_relobj_file* object, + unsigned int data_shndx, + unsigned int sh_type, + const unsigned char* prelocs, + size_t reloc_count, + Output_section* output_section, + bool needs_special_offset_handling, + size_t local_symbol_count, + const unsigned char* plocal_syms, + Relocatable_relocs* rr) +{ + typedef gold::Default_classify_reloc + Classify_reloc; + typedef gold::Default_emit_relocs_strategy + Emit_relocs_strategy; + + gold_assert(sh_type == elfcpp::SHT_RELA); + + gold::scan_relocatable_relocs( + symtab, + layout, + object, + data_shndx, + prelocs, + reloc_count, + output_section, + needs_special_offset_handling, + local_symbol_count, + plocal_syms, + rr); +} + // Emit relocations for a section. // This is a modified version of the function by the same name in // target-reloc.h. Using relocate_special_relocatable for @@ -7922,7 +11341,6 @@ Target_powerpc::relocate_relocs( size_t reloc_count, Output_section* output_section, typename elfcpp::Elf_types::Elf_Off offset_in_output_section, - const Relocatable_relocs* rr, unsigned char*, Address view_address, section_size_type, @@ -7931,12 +11349,11 @@ 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; Powerpc_relobj* const object = static_cast*>(relinfo->object); @@ -7949,11 +11366,13 @@ 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) { - Relocatable_relocs::Reloc_strategy strategy = rr->strategy(i); + Relocatable_relocs::Reloc_strategy strategy = relinfo->rr->strategy(i); if (strategy == Relocatable_relocs::RELOC_DISCARD) continue; @@ -7979,6 +11398,7 @@ Target_powerpc::relocate_relocs( } // Get the new symbol index. + Output_section* os = NULL; if (r_sym < local_count) { switch (strategy) @@ -8003,7 +11423,7 @@ Target_powerpc::relocate_relocs( unsigned int shndx = object->local_symbol_input_shndx(r_sym, &is_ordinary); gold_assert(is_ordinary); - Output_section* os = object->output_section(shndx); + os = object->output_section(shndx); gold_assert(os != NULL); gold_assert(os->needs_symtab_index()); r_sym = os->symtab_index(); @@ -8043,7 +11463,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) @@ -8057,16 +11477,37 @@ Target_powerpc::relocate_relocs( { const Symbol_value* psymval = object->local_symbol(orig_r_sym); 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) { - if (addend >= 32768) - addend += got2_addend; + if (size == 32) + { + if (addend >= 32768) + addend += got2_addend; + } + else if (r_type == elfcpp::R_POWERPC_REL16_HA) + { + r_type = elfcpp::R_POWERPC_ADDR16_HA; + addend -= d_offset; + } + else if (r_type == elfcpp::R_POWERPC_REL16_LO) + { + r_type = elfcpp::R_POWERPC_ADDR16_LO; + addend -= d_offset + 4; + } } 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 @@ -8089,7 +11530,7 @@ Target_powerpc::relocate_relocs( else { r_type = elfcpp::R_POWERPC_NONE; - offset -= 2 * big_endian; + offset -= d_offset; } break; default: @@ -8119,7 +11560,7 @@ Target_powerpc::relocate_relocs( else { r_type = elfcpp::R_POWERPC_NONE; - offset -= 2 * big_endian; + offset -= d_offset; } } } @@ -8138,7 +11579,7 @@ Target_powerpc::relocate_relocs( else { r_type = elfcpp::R_POWERPC_NONE; - offset -= 2 * big_endian; + offset -= d_offset; } } } @@ -8156,7 +11597,7 @@ Target_powerpc::relocate_relocs( break; case tls::TLSOPT_TO_LE: r_type = elfcpp::R_POWERPC_TPREL16_LO; - offset += 2 * big_endian; + offset += d_offset; zap_next = true; break; default: @@ -8177,7 +11618,7 @@ Target_powerpc::relocate_relocs( r_sym = os->symtab_index(); addend = dtp_offset; r_type = elfcpp::R_POWERPC_TPREL16_LO; - offset += 2 * big_endian; + offset += d_offset; zap_next = true; } } @@ -8188,7 +11629,7 @@ Target_powerpc::relocate_relocs( if (this->optimize_tls_ie(final) == tls::TLSOPT_TO_LE) { r_type = elfcpp::R_POWERPC_TPREL16_LO; - offset += 2 * big_endian; + offset += d_offset; } } } @@ -8220,15 +11661,16 @@ 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) { - unsigned int off = this->glink_section()->find_global_entry(gsym); - if (off != (unsigned int)-1) + Address off = this->glink_section()->find_global_entry(gsym); + if (off != invalid_address) return this->glink_section()->global_entry_address() + off; } gold_unreachable(); @@ -8249,10 +11691,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(); @@ -8270,15 +11712,16 @@ 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) { - unsigned int off = this->glink_section()->find_global_entry(gsym); - if (off != (unsigned int)-1) + Address off = this->glink_section()->find_global_entry(gsym); + if (off != invalid_address) return this->glink_section()->global_entry_address() + off; } gold_unreachable(); @@ -8376,8 +11819,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