X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fpowerpc.cc;h=e251a9341f482aab87d85928b21129490ca67783;hb=abdb711e0855f0597a96db0486b598144b788212;hp=4abfcec16d6efa765310d71758beb0eba698b0ed;hpb=e666304ec603bb3249f80bac97200f2b4520ab0f;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 4abfcec16d..e251a9341f 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -1,6 +1,6 @@ // powerpc.cc -- powerpc target support for gold. -// Copyright (C) 2008-2017 Free Software Foundation, Inc. +// Copyright (C) 2008-2019 Free Software Foundation, Inc. // Written by David S. Miller // and David Edelsohn @@ -41,6 +41,7 @@ #include "tls.h" #include "errors.h" #include "gc.h" +#include "attributes.h" namespace { @@ -78,8 +79,13 @@ struct Stub_table_owner const Output_section::Input_section* owner; }; -inline bool -is_branch_reloc(unsigned int r_type); +inline bool is_branch_reloc(unsigned int); + +template +inline bool is_plt16_reloc(unsigned int); + +// Counter incremented on every Powerpc_relobj constructed. +static uint32_t object_id = 0; template class Powerpc_relobj : public Sized_relobj_file @@ -92,16 +98,17 @@ 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), relatoc_(0), toc_(0), no_toc_opt_(), - 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 @@ -357,6 +364,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; } @@ -365,6 +376,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); } @@ -373,6 +390,11 @@ public: ppc64_local_entry_offset(unsigned int symndx) const { return elfcpp::ppc64_decode_local_entry(this->st_other_[symndx] >> 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 { @@ -396,6 +418,9 @@ 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_; @@ -403,10 +428,6 @@ private: unsigned int relatoc_; unsigned int toc_; - // 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_; - // For 64-bit, whether this object uses small model relocs to access // the toc. bool has_small_toc_reloc_; @@ -418,6 +439,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 @@ -435,11 +463,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 @@ -451,13 +479,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, @@ -516,6 +545,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 @@ -548,14 +582,17 @@ 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 @@ -583,6 +620,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; @@ -590,12 +628,18 @@ class Target_powerpc : public Sized_target Target_powerpc() : Sized_target(&powerpc_info), - got_(NULL), plt_(NULL), iplt_(NULL), brlt_section_(NULL), + got_(NULL), plt_(NULL), iplt_(NULL), lplt_(NULL), brlt_section_(NULL), glink_(NULL), rela_dyn_(NULL), copy_relocs_(), tlsld_got_offset_(-1U), - stub_tables_(), branch_lookup_table_(), branch_info_(), - plt_thread_safe_(false), relax_failed_(false), relax_fail_count_(0), - stub_group_size_(0), savres_section_(0) + stub_tables_(), branch_lookup_table_(), branch_info_(), tocsave_loc_(), + 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) { } @@ -670,6 +714,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*); @@ -806,6 +883,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 @@ -935,16 +1046,93 @@ 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 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; @@ -952,11 +1140,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 @@ -971,13 +1195,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(); } @@ -995,7 +1219,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; @@ -1003,21 +1227,26 @@ 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) + 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 - || r_type == elfcpp::R_PPC_PLTREL24) + || r_type == elfcpp::R_PPC_PLTREL24 + || is_plt16_reloc(r_type) + || r_type == elfcpp::R_POWERPC_PLTSEQ + || r_type == elfcpp::R_POWERPC_PLTCALL) && gsym != NULL - && strcmp(gsym->name(), "__tls_get_addr") == 0); - Tls_get_addr last_tls = this->tls_get_addr_; - this->tls_get_addr_ = NOT_EXPECTED; + && (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) @@ -1040,7 +1269,7 @@ class Target_powerpc : public Sized_target // 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_; @@ -1186,7 +1415,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 @@ -1211,7 +1440,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) @@ -1222,7 +1452,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; @@ -1231,7 +1462,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; @@ -1248,6 +1481,9 @@ class Target_powerpc : public Sized_target void make_iplt_section(Symbol_table*, Layout*); + void + make_lplt_section(Layout*); + void make_brlt_section(Layout*); @@ -1261,6 +1497,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 @@ -1319,12 +1561,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*, @@ -1337,7 +1586,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_; }; @@ -1385,6 +1635,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. @@ -1402,14 +1654,33 @@ class Target_powerpc : public Sized_target typedef std::vector Branches; Branches branch_info_; + Tocsave_loc tocsave_loc_; 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<> @@ -1438,6 +1709,7 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1466,6 +1738,7 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1475,9 +1748,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 @@ -1494,6 +1767,7 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; template<> @@ -1503,9 +1777,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 @@ -1522,6 +1796,7 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info = NULL, // attributes_vendor "_start", // entry_symbol_name 32, // hash_entry_size + elfcpp::SHT_PROGBITS, // unwind_section_type }; inline bool @@ -1539,6 +1814,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. @@ -2060,6 +2346,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; @@ -2093,6 +2381,56 @@ Powerpc_relobj::do_read_symbols(Read_symbols_data* sd) } } } + + const size_t shdr_size = elfcpp::Elf_sizes::shdr_size; + const unsigned char* ps = sd->section_headers->data() + shdr_size; + bool merge_attributes = false; + for (unsigned int i = 1; i < this->shnum(); ++i, ps += shdr_size) + { + elfcpp::Shdr shdr(ps); + switch (shdr.get_sh_type()) + { + case elfcpp::SHT_GNU_ATTRIBUTES: + { + gold_assert(this->attributes_section_data_ == NULL); + section_offset_type section_offset = shdr.get_sh_offset(); + section_size_type section_size = + convert_to_section_size_type(shdr.get_sh_size()); + const unsigned char* view = + this->get_view(section_offset, section_size, true, false); + this->attributes_section_data_ = + new Attributes_section_data(view, section_size); + } + break; + + case elfcpp::SHT_SYMTAB: + { + // Sometimes an object has no contents except the section + // name string table and an empty symbol table with the + // undefined symbol. We don't want to merge + // processor-specific flags from such an object. + const typename elfcpp::Elf_types::Elf_WXword sym_size = + elfcpp::Elf_sizes::sym_size; + if (shdr.get_sh_size() > sym_size) + merge_attributes = true; + } + break; + + case elfcpp::SHT_STRTAB: + break; + + default: + merge_attributes = true; + break; + } + } + + if (!merge_attributes) + { + // Should rarely happen. + delete this->attributes_section_data_; + this->attributes_section_data_ = NULL; + } } template @@ -2124,9 +2462,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); @@ -2244,6 +2599,35 @@ Powerpc_relobj::do_relocate_sections( } 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. @@ -2314,6 +2698,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. @@ -2401,6 +2815,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); @@ -2432,6 +2849,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); @@ -2836,7 +3256,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()); @@ -2861,6 +3282,40 @@ max_branch_delta (unsigned int r_type) 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 @@ -2871,12 +3326,14 @@ Target_powerpc::Branch_info::make_stub( Symbol_table* symtab) const { Symbol* sym = this->object_->global_symbol(this->r_sym_); - if (sym != NULL && sym->is_forwarder()) - sym = symtab->resolve_forwards(sym); - const Sized_symbol* gsym = static_cast*>(sym); Target_powerpc* target = static_cast*>( parameters->sized_target()); + if (sym != NULL && sym->is_forwarder()) + sym = symtab->resolve_forwards(sym); + if (target->replace_tls_get_addr(sym)) + sym = target->tls_get_addr_opt(); + const Sized_symbol* gsym = static_cast*>(sym); bool ok = true; if (gsym != NULL @@ -2891,11 +3348,17 @@ Target_powerpc::Branch_info::make_stub( 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); @@ -2906,11 +3369,13 @@ Target_powerpc::Branch_info::make_stub( if (gsym != NULL) ok = stub_table->add_plt_call_entry(from, this->object_, gsym, - this->r_type_, this->addend_); + this->r_type_, this->addend_, + this->tocsave_); else ok = stub_table->add_plt_call_entry(from, this->object_, this->r_sym_, - this->r_type_, this->addend_); + this->r_type_, this->addend_, + this->tocsave_); } } else @@ -3164,6 +3629,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(); @@ -3173,7 +3648,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()); } } @@ -3232,6 +3706,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; } @@ -3273,7 +3777,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 @@ -3322,6 +3826,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); @@ -3359,8 +3866,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(); } @@ -3423,6 +3930,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 @@ -3450,6 +3982,8 @@ 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; @@ -3471,10 +4005,14 @@ 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; @@ -3483,9 +4021,12 @@ 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 lfd_0_1 = 0xc8010000; @@ -3497,17 +4038,22 @@ 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; @@ -3515,6 +4061,7 @@ 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; @@ -3528,7 +4075,7 @@ 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 @@ -3606,13 +4153,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); } } @@ -3706,27 +4290,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); } } @@ -3794,7 +4377,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 }; @@ -3806,7 +4389,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 }; @@ -3839,6 +4422,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 @@ -3848,12 +4440,24 @@ 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), r2save_(0), localentry0_(0) + { } + + unsigned int off_; + unsigned int indx_ : 30; + unsigned int r2save_ : 1; + unsigned int localentry0_ : 1; + }; 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())), @@ -3861,7 +4465,8 @@ class Stub_table : public Output_relaxed_input_section orig_data_size_(owner->current_data_size()), plt_size_(0), last_plt_size_(0), branch_size_(0), last_branch_size_(0), min_size_threshold_(0), - eh_frame_added_(false), need_save_res_(false) + need_save_res_(false), uniq_(id), tls_get_addr_opt_bctrl_(-1u), + plt_fde_len_(0) { this->set_output_section(output_section); @@ -3876,30 +4481,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, @@ -3982,9 +4589,13 @@ class Stub_table : public Output_relaxed_input_section plt_size() const { return this->plt_size_; } - void set_min_size_threshold(Address min_size) + void + set_min_size_threshold(Address min_size) { this->min_size_threshold_ = min_size; } + void + define_stub_syms(Symbol_table*); + bool size_update() { @@ -4016,73 +4627,54 @@ 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. + // Generate a suitable FDE to describe code in this stub group. void - add_eh_frame(Layout* layout) - { - if (!this->eh_frame_added_) - { - if (!parameters->options().ld_generated_unwind_info()) - return; + init_plt_fde(); - // 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 info for this stub section. + void + 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_ent; + class Branch_stub_ent_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); } } @@ -4091,20 +4683,24 @@ class Stub_table : public Output_relaxed_input_section plt_call_size(typename Plt_stub_entries::const_iterator p) const { if (size == 32) - return 16; + { + const Symbol* gsym = p->first.sym_; + return (4 * 4 + + (this->targ_->is_tls_get_addr_opt(gsym) ? 8 * 4 : 0)); + } - 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(); + const Output_data_plt_powerpc* plt; + Address plt_addr = this->plt_off(p, &plt); + plt_addr += plt->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); + const Symbol* gsym = p->first.sym_; + if (this->targ_->is_tls_get_addr_opt(gsym)) + bytes += 13 * 4; if (this->targ_->abiversion() < 2) { bool static_chain = parameters->options().plt_static_chain(); @@ -4114,23 +4710,27 @@ class Stub_table : public Output_relaxed_input_section + 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) + branch_stub_size(typename Branch_stub_entries::const_iterator p) { - Address loc - = this->stub_address() + this->last_plt_size_ + this->branch_size_; - if (to - loc + (1 << 25) < 2 << 25) + Address loc = this->stub_address() + this->last_plt_size_ + p->second; + if (p->first.dest_ - loc + (1 << 25) < 2 << 25) return 4; - if (size == 64 || !parameters->options().output_is_position_independent()) - return 16; - return 32; + unsigned int bytes = 16; + if (size == 32 && parameters->options().output_is_position_independent()) + bytes += 16; + return bytes; } // Write out stubs. @@ -4138,19 +4738,19 @@ class Stub_table : public Output_relaxed_input_section 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) @@ -4159,7 +4759,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) @@ -4167,7 +4768,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) @@ -4176,11 +4777,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_ @@ -4194,10 +4796,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_) @@ -4242,8 +4844,6 @@ class Stub_table : public Output_relaxed_input_section // Map sym/object/addend to stub offset. Plt_stub_entries plt_call_stubs_; // Map destination address to stub offset. - typedef Unordered_map Branch_stub_entries; Branch_stub_entries long_branch_stubs_; // size of input section section_size_type orig_data_size_; @@ -4256,11 +4856,16 @@ class Stub_table : public Output_relaxed_input_section // a stub table, it is zero for the first few iterations, then // increases monotonically. Address min_size_threshold_; - // Whether .eh_frame info has been created for this stub section. - bool eh_frame_added_; // Set if this stub group needs a copy of out-of-line register // save/restore functions. bool need_save_res_; + // Per stub table unique identifier. + uint32_t uniq_; + // The bctrl in the __tls_get_addr_opt stub, if present. + unsigned int tls_get_addr_opt_bctrl_; + // FDE unwind info for this stub group. + unsigned int plt_fde_len_; + unsigned char plt_fde_[20]; }; // Add a plt call stub, if we do not already have one for this @@ -4273,15 +4878,34 @@ 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)); + = this->plt_call_stubs_.insert(std::make_pair(key, ent)); if (p.second) - this->plt_size_ = off + this->plt_call_size(p.first); - return this->can_reach_stub(from, off, r_type); + { + this->plt_size_ = ent.off_ + this->plt_call_size(p.first); + if (size == 64 + && this->targ_->is_elfv2_localentry0(gsym)) + { + p.first->second.localentry0_ = 1; + this->targ_->set_has_localentry0(); + } + if (this->targ_->is_tls_get_addr_opt(gsym)) + { + this->targ_->set_has_tls_get_addr_opt(); + this->tls_get_addr_opt_bctrl_ = this->plt_size_ - 5 * 4; + } + this->plt_size_ = this->plt_call_align(this->plt_size_); + } + if (size == 64 + && !tocsave + && !p.first->second.localentry0_) + p.first->second.r2save_ = 1; + return this->can_reach_stub(from, ent.off_, r_type); } template @@ -4291,63 +4915,85 @@ 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)); + = this->plt_call_stubs_.insert(std::make_pair(key, ent)); if (p.second) - this->plt_size_ = off + this->plt_call_size(p.first); - return this->can_reach_stub(from, off, r_type); + { + this->plt_size_ = ent.off_ + this->plt_call_size(p.first); + this->plt_size_ = this->plt_call_align(this->plt_size_); + if (size == 64 + && this->targ_->is_elfv2_localentry0(object, locsym_index)) + { + p.first->second.localentry0_ = 1; + this->targ_->set_has_localentry0(); + } + } + if (size == 64 + && !tocsave + && !p.first->second.localentry0_) + p.first->second.r2save_ = 1; + return this->can_reach_stub(from, ent.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 @@ -4364,13 +5010,15 @@ Stub_table::add_long_branch_entry( { Branch_stub_ent ent(object, to, save_res); Address off = this->branch_size_; - if (this->long_branch_stubs_.insert(std::make_pair(ent, off)).second) + std::pair p + = this->long_branch_stubs_.insert(std::make_pair(ent, off)); + if (p.second) { if (save_res) this->need_save_res_ = true; else { - unsigned int stub_size = this->branch_stub_size(to); + unsigned int stub_size = this->branch_stub_size(p.first); this->branch_size_ = off + stub_size; if (size == 64 && stub_size != 4) this->targ_->add_branch_lookup_table(to); @@ -4397,6 +5045,94 @@ Stub_table::find_long_branch_entry( return p->second; } +// Generate a suitable FDE to describe code in this stub group. +// 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. + +template +void +Stub_table::init_plt_fde() +{ + unsigned char* p = this->plt_fde_; + // offset pcrel sdata4, size udata4, and augmentation size byte. + memset (p, 0, 9); + p += 9; + if (this->tls_get_addr_opt_bctrl_ != -1u) + { + unsigned int to_bctrl = this->tls_get_addr_opt_bctrl_ / 4; + if (to_bctrl < 64) + *p++ = elfcpp::DW_CFA_advance_loc + to_bctrl; + else if (to_bctrl < 256) + { + *p++ = elfcpp::DW_CFA_advance_loc1; + *p++ = to_bctrl; + } + else if (to_bctrl < 65536) + { + *p++ = elfcpp::DW_CFA_advance_loc2; + elfcpp::Swap<16, big_endian>::writeval(p, to_bctrl); + p += 2; + } + else + { + *p++ = elfcpp::DW_CFA_advance_loc4; + elfcpp::Swap<32, big_endian>::writeval(p, to_bctrl); + p += 4; + } + *p++ = elfcpp::DW_CFA_offset_extended_sf; + *p++ = 65; + *p++ = -(this->targ_->stk_linker() / 8) & 0x7f; + *p++ = elfcpp::DW_CFA_advance_loc + 4; + *p++ = elfcpp::DW_CFA_restore_extended; + *p++ = 65; + } + this->plt_fde_len_ = p - this->plt_fde_; +} + +// 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 (!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; + + if (this->plt_size_ + this->branch_size_ + this->need_save_res_ == 0) + return; + + this->init_plt_fde(); + layout->add_eh_frame_for_plt(this, + Eh_cie::eh_frame_cie, + sizeof (Eh_cie::eh_frame_cie), + this->plt_fde_, this->plt_fde_len_); +} + +template +void +Stub_table::remove_eh_frame(Layout* layout) +{ + if (this->plt_fde_len_ != 0) + { + layout->remove_eh_frame_for_plt(this, + Eh_cie::eh_frame_cie, + sizeof (Eh_cie::eh_frame_cie), + this->plt_fde_, this->plt_fde_len_); + this->plt_fde_len_ = 0; + } +} + // A class to handle .glink. template @@ -4405,7 +5141,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_(), @@ -4421,12 +5156,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: @@ -4498,10 +5254,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 @@ -4528,11 +5285,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; @@ -4545,12 +5302,88 @@ Output_data_glink::set_final_data_size() } } this->end_branch_table_ = total; - total = (total + 15) & -16; + total = this->global_entry_align(total); total += this->ge_size_; this->set_data_size(total); } +// Define symbols on stubs, identifying the stub. + +template +void +Stub_table::define_stub_syms(Symbol_table* symtab) +{ + if (!this->plt_call_stubs_.empty()) + { + // The key for the plt call stub hash table includes addresses, + // therefore traversal order depends on those addresses, which + // can change between runs if gold is a PIE. Unfortunately the + // output .symtab ordering depends on the order in which symbols + // are added to the linker symtab. We want reproducible output + // so must sort the call stub symbols. + typedef typename Plt_stub_entries::const_iterator plt_iter; + std::vector sorted; + sorted.resize(this->plt_call_stubs_.size()); + + for (plt_iter cs = this->plt_call_stubs_.begin(); + cs != this->plt_call_stubs_.end(); + ++cs) + sorted[cs->second.indx_] = cs; + + for (unsigned int i = 0; i < this->plt_call_stubs_.size(); ++i) + { + plt_iter cs = sorted[i]; + char add[10]; + add[0] = 0; + if (cs->first.addend_ != 0) + sprintf(add, "+%x", static_cast(cs->first.addend_)); + char obj[10]; + obj[0] = 0; + if (cs->first.object_) + { + const Powerpc_relobj* ppcobj = static_cast + *>(cs->first.object_); + sprintf(obj, "%x:", ppcobj->uniq()); + } + char localname[9]; + const char *symname; + if (cs->first.sym_ == NULL) + { + sprintf(localname, "%x", cs->first.locsym_); + symname = localname; + } + else if (this->targ_->is_tls_get_addr_opt(cs->first.sym_)) + symname = this->targ_->tls_get_addr_opt()->name(); + else + symname = cs->first.sym_->name(); + char* name = new char[8 + 10 + strlen(obj) + strlen(symname) + strlen(add) + 1]; + sprintf(name, "%08x.plt_call.%s%s%s", this->uniq_, obj, symname, add); + Address value + = this->stub_address() - this->address() + cs->second.off_; + unsigned int stub_size = this->plt_call_align(this->plt_call_size(cs)); + this->targ_->define_local(symtab, name, this, value, stub_size); + } + } + + typedef typename Branch_stub_entries::const_iterator branch_iter; + for (branch_iter bs = this->long_branch_stubs_.begin(); + bs != this->long_branch_stubs_.end(); + ++bs) + { + if (bs->first.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); + unsigned int stub_size = this->branch_stub_size(bs); + this->targ_->define_local(symtab, name, this, value, stub_size); + } +} + // Write out plt and long branch stub code. template @@ -4576,27 +5409,15 @@ Stub_table::do_write(Output_file* of) 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; - // 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) { - bool is_iplt; - Address pltoff = this->plt_off(cs, &is_iplt); - Address plt_addr = pltoff; - 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 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(); @@ -4620,14 +5441,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); @@ -4635,11 +5457,42 @@ 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_; + const Symbol* gsym = cs->first.sym_; + if (this->targ_->is_tls_get_addr_opt(gsym)) { - write_insn(p, std_2_1 + this->targ_->stk_toc()); + 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.localentry0_) + { + write_insn(p, mflr_11); + p += 4; + write_insn(p, (std_11_1 + + this->targ_->stk_linker())); + p += 4; + } + use_fake_dep = thread_safe; + } + if (ha(off) != 0) + { + if (cs->second.r2save_) + { + write_insn(p, + std_2_1 + this->targ_->stk_toc()); + p += 4; + } if (plt_load_toc) { write_insn(p, addis_11_2 + ha(off)); @@ -4683,8 +5536,12 @@ Stub_table::do_write(Output_file* of) } else { - write_insn(p, std_2_1 + this->targ_->stk_toc()); - p += 4; + if (cs->second.r2save_) + { + 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 @@ -4714,7 +5571,20 @@ Stub_table::do_write(Output_file* of) p += 4; } } - if (thread_safe && !use_fake_dep) + if (!cs->second.localentry0_ + && this->targ_->is_tls_get_addr_opt(gsym)) + { + 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); + } + else if (thread_safe && !use_fake_dep) { write_insn(p, cmpldi_2_0); p += 4; @@ -4766,9 +5636,6 @@ Stub_table::do_write(Output_file* of) { 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; @@ -4778,18 +5645,31 @@ 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) + const Output_data_plt_powerpc* plt; + Address plt_addr = this->plt_off(cs, &plt); + plt_addr += plt->address(); + + p = oview + cs->second.off_; + const Symbol* gsym = cs->first.sym_; + if (this->targ_->is_tls_get_addr_opt(gsym)) { - if (iplt_base == invalid_address) - iplt_base = this->targ_->iplt_section()->address(); - plt_addr += iplt_base; + 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; } - else - plt_addr += plt_base; - - p = oview + cs->second; if (parameters->options().output_is_position_independent()) { Address got_addr; @@ -4817,26 +5697,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); } } @@ -4855,23 +5733,29 @@ Stub_table::do_write(Output_file* of) 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_) @@ -4927,6 +5811,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; @@ -4938,8 +5823,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; @@ -4965,7 +5849,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(); @@ -5006,7 +5890,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; @@ -5014,68 +5898,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); @@ -5455,6 +6356,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 @@ -5572,6 +6487,10 @@ Target_powerpc::Scan::get_reference_flags( case elfcpp::R_PPC64_TOC16_HA: case elfcpp::R_PPC64_TOC16_DS: case elfcpp::R_PPC64_TOC16_LO_DS: + case elfcpp::R_POWERPC_PLT16_LO: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_PPC64_PLT16_LO_DS: ref = Symbol::RELATIVE_REF; break; @@ -5755,6 +6674,16 @@ Target_powerpc::Scan::reloc_needs_plt_for_ifunc( case elfcpp::R_PPC64_GOT16_LO_DS: 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: + return true; + break; + // Function calls are good, and these do need a PLT entry. case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_ADDR14: @@ -5841,7 +6770,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)) @@ -5887,9 +6816,10 @@ 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: break; case elfcpp::R_PPC64_TOC: @@ -5981,6 +6911,17 @@ Target_powerpc::Scan::local( } break; + 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_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: case elfcpp::R_PPC_LOCAL24PC: @@ -5995,6 +6936,27 @@ Target_powerpc::Scan::local( } 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: case elfcpp::R_POWERPC_REL32: case elfcpp::R_POWERPC_REL16: @@ -6272,7 +7234,7 @@ Target_powerpc::Scan::local( 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_offset(); + Address dst_off = lsym.get_st_value() + reloc.get_r_addend(); if (dst_off < ppc_object->section_size(shndx)) { bool ok = false; @@ -6368,9 +7330,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)) { @@ -6412,6 +7380,8 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC_LOCAL24PC: case elfcpp::R_POWERPC_TLS: case elfcpp::R_PPC64_ENTRY: + case elfcpp::R_POWERPC_PLTSEQ: + case elfcpp::R_POWERPC_PLTCALL: break; case elfcpp::R_PPC64_TOC: @@ -6547,6 +7517,14 @@ Target_powerpc::Scan::global( } break; + 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_PPC_PLTREL24: case elfcpp::R_POWERPC_REL24: if (!is_ifunc) @@ -6598,6 +7576,29 @@ Target_powerpc::Scan::global( } 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: @@ -6917,7 +7918,7 @@ Target_powerpc::Scan::global( if (shndx == sym_object->toc_shndx()) { Sized_symbol* sym = symtab->get_sized_symbol(gsym); - Address dst_off = sym->value() + reloc.get_r_offset(); + Address dst_off = sym->value() + reloc.get_r_addend(); if (dst_off < sym_object->section_size(shndx)) { bool ok = false; @@ -7275,6 +8276,23 @@ Target_powerpc::scan_relocs( typedef gold::Default_classify_reloc Classify_reloc; + if (!this->plt_localentry0_init_) + { + bool plt_localentry0 = false; + if (size == 64 + && this->abiversion() >= 2) + { + if (parameters->options().user_set_plt_localentry()) + plt_localentry0 = parameters->options().plt_localentry(); + if (plt_localentry0 + && symtab->lookup("GLIBC_2.26", NULL) == NULL) + gold_warning(_("--plt-localentry is especially dangerous without " + "ld.so support to detect ABI violations")); + } + this->plt_localentry0_ = plt_localentry0; + this->plt_localentry0_init_ = true; + } + if (sh_type == elfcpp::SHT_REL) { gold_error(_("%s: unsupported REL reloc section"), @@ -7383,7 +8401,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()) @@ -7460,6 +8478,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 { @@ -7468,9 +8488,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))); } } @@ -7478,6 +8504,243 @@ 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); + } +} + +// Merge object attributes from input file called NAME with those of the +// output. The input object attributes are in the object pointed by PASD. + +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 @@ -7585,12 +8848,19 @@ Target_powerpc::Relocate::relocate( Address address, section_size_type view_size) { + typedef Powerpc_relocate_functions Reloc; + typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; + typedef typename elfcpp::Rela Reltype; + if (view == NULL) return true; + if (target->replace_tls_get_addr(gsym)) + gsym = static_cast*>(target->tls_get_addr_opt()); + const elfcpp::Rela rela(preloc); unsigned int r_type = elfcpp::elf_r_type(rela.get_r_info()); - switch (this->maybe_skip_tls_get_addr_call(r_type, gsym)) + switch (this->maybe_skip_tls_get_addr_call(target, r_type, gsym)) { case Track_tls::NOT_EXPECTED: gold_error_at_location(relinfo, relnum, rela.get_r_offset(), @@ -7600,14 +8870,22 @@ 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) + { + 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); + } return true; case Track_tls::NORMAL: break; } - typedef Powerpc_relocate_functions Reloc; - typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; - typedef typename elfcpp::Rela Reltype; // Offset from start of insn to d-field reloc. const int d_offset = big_endian ? 2 : 0; @@ -7615,10 +8893,16 @@ Target_powerpc::Relocate::relocate( = static_cast*>(relinfo->object); Address value = 0; bool has_stub_value = false; + bool localentry0 = false; unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); - if ((gsym != NULL + bool has_plt_offset + = (gsym != NULL ? gsym->use_plt_offset(Scan::get_reference_flags(r_type, target)) - : object->local_has_plt_offset(r_sym)) + : object->local_has_plt_offset(r_sym)); + if (has_plt_offset + && !is_plt16_reloc(r_type) + && r_type != elfcpp::R_POWERPC_PLTSEQ + && r_type != elfcpp::R_POWERPC_PLTCALL && (!psymval->is_ifunc_symbol() || Scan::reloc_needs_plt_for_ifunc(target, object, r_type, false))) { @@ -7637,26 +8921,49 @@ Target_powerpc::Relocate::relocate( } else { - Stub_table* stub_table - = object->stub_table(relinfo->data_shndx); + Stub_table* stub_table = NULL; + if (target->stub_tables().size() == 1) + stub_table = target->stub_tables()[0]; + if (stub_table == NULL + && !(size == 32 + && gsym != NULL + && !parameters->options().output_is_position_independent() + && !is_branch_reloc(r_type))) + stub_table = object->stub_table(relinfo->data_shndx); if (stub_table == NULL) { - // This is a ref from a data section to an ifunc symbol. + // This is a ref from a data section to an ifunc symbol, + // or a non-branch reloc for which we always want to use + // one set of stubs for resolving function addresses. if (target->stub_tables().size() != 0) stub_table = target->stub_tables()[0]; } if (stub_table != NULL) { - Address off; + const typename Stub_table::Plt_stub_ent* ent; if (gsym != NULL) - off = stub_table->find_plt_call_entry(object, gsym, r_type, + ent = stub_table->find_plt_call_entry(object, gsym, r_type, rela.get_r_addend()); else - off = stub_table->find_plt_call_entry(object, r_sym, r_type, + ent = stub_table->find_plt_call_entry(object, r_sym, r_type, rela.get_r_addend()); - if (off != invalid_address) + if (ent != NULL) { - value = stub_table->stub_address() + off; + value = stub_table->stub_address() + ent->off_; + const int reloc_size = elfcpp::Elf_sizes::rela_size; + elfcpp::Shdr shdr(relinfo->reloc_shdr); + size_t reloc_count = shdr.get_sh_size() / reloc_size; + if (size == 64 + && ent->r2save_ + && relnum + 1 < reloc_count) + { + 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; } } @@ -7667,12 +8974,46 @@ Target_powerpc::Relocate::relocate( gold_assert(has_stub_value || !(os->flags() & elfcpp::SHF_ALLOC)); } - if (r_type == elfcpp::R_POWERPC_GOT16 - || r_type == elfcpp::R_POWERPC_GOT16_LO - || r_type == elfcpp::R_POWERPC_GOT16_HI - || r_type == elfcpp::R_POWERPC_GOT16_HA - || r_type == elfcpp::R_PPC64_GOT16_DS - || r_type == elfcpp::R_PPC64_GOT16_LO_DS) + if (has_plt_offset && is_plt16_reloc(r_type)) + { + 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) + 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)) + { + Insn* iview = reinterpret_cast(view); + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + 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) { if (gsym != NULL) { @@ -7700,8 +9041,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); @@ -8003,8 +9344,24 @@ Target_powerpc::Relocate::relocate( } else if (!has_stub_value) { + if (!has_plt_offset && r_type == elfcpp::R_POWERPC_PLTCALL) + { + // 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 + 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)) @@ -8171,6 +9528,23 @@ 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; } @@ -8263,6 +9637,38 @@ Target_powerpc::Relocate::relocate( } 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()); @@ -8479,6 +9885,8 @@ 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: break; case elfcpp::R_PPC64_ADDR64: @@ -8540,6 +9948,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_LO: case elfcpp::R_PPC64_TOC16_LO: case elfcpp::R_POWERPC_GOT16_LO: + case elfcpp::R_POWERPC_PLT16_LO: case elfcpp::R_POWERPC_SECTOFF_LO: case elfcpp::R_POWERPC_TPREL16_LO: case elfcpp::R_POWERPC_DTPREL16_LO: @@ -8566,6 +9975,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_HI: 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: @@ -8587,6 +9997,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL16_HA: 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: @@ -8659,6 +10070,7 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TOC16_LO_DS: case elfcpp::R_PPC64_GOT16_DS: case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_PLT16_LO_DS: case elfcpp::R_PPC64_SECTOFF_DS: case elfcpp::R_PPC64_SECTOFF_LO_DS: maybe_dq_reloc = true; @@ -8685,12 +10097,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; @@ -8703,9 +10129,6 @@ Target_powerpc::Relocate::relocate( 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: @@ -8714,7 +10137,6 @@ 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: @@ -8841,7 +10263,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; } @@ -8962,6 +10388,8 @@ Target_powerpc::relocate_relocs( gold_assert(got2_addend != invalid_address); } + const bool relocatable = parameters->options().relocatable(); + unsigned char* pwrite = reloc_view; bool zap_next = false; for (size_t i = 0; i < reloc_count; ++i, prelocs += reloc_size) @@ -9057,7 +10485,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) @@ -9070,8 +10498,15 @@ Target_powerpc::relocate_relocs( else if (strategy == Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_RELA) { const Symbol_value* psymval = object->local_symbol(orig_r_sym); - gold_assert(os != NULL); - addend = psymval->value(object, addend) - os->address(); + addend = psymval->value(object, addend); + // In a relocatable link, the symbol value is relative to + // the start of the output section. For a non-relocatable + // link, we need to adjust the addend. + if (!relocatable) + { + gold_assert(os != NULL); + addend -= os->address(); + } } else if (strategy == Relocatable_relocs::RELOC_SPECIAL) { @@ -9094,7 +10529,7 @@ Target_powerpc::relocate_relocs( else gold_unreachable(); - if (!parameters->options().relocatable()) + if (!relocatable) { if (r_type == elfcpp::R_POWERPC_GOT_TLSGD16 || r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO @@ -9248,9 +10683,10 @@ Target_powerpc::do_dynsym_value(const Symbol* gsym) const p != this->stub_tables_.end(); ++p) { - Address off = (*p)->find_plt_call_entry(gsym); - if (off != invalid_address) - return (*p)->stub_address() + off; + const typename Stub_table::Plt_stub_ent* ent + = (*p)->find_plt_call_entry(gsym); + if (ent != NULL) + return (*p)->stub_address() + ent->off_; } } else if (this->abiversion() >= 2) @@ -9277,10 +10713,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(); @@ -9298,9 +10734,10 @@ Target_powerpc::do_plt_address_for_global( p != this->stub_tables_.end(); ++p) { - Address off = (*p)->find_plt_call_entry(gsym); - if (off != invalid_address) - return (*p)->stub_address() + off; + const typename Stub_table::Plt_stub_ent* ent + = (*p)->find_plt_call_entry(gsym); + if (ent != NULL) + return (*p)->stub_address() + ent->off_; } } else if (this->abiversion() >= 2) @@ -9404,8 +10841,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