X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gold%2Fpowerpc.cc;h=231978910e7d6bd1b4c4c87e5cc13f76f57d57ff;hb=89e0345fdfad506e4692126cabd618ef859dc63f;hp=9c42c3ca6decfe8e557f35a9daed8ff9a81d8606;hpb=f43ba157ad5d77640afeaf56e13762917b919c98;p=platform%2Fupstream%2Fbinutils.git diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 9c42c3c..2319789 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -1,6 +1,6 @@ // powerpc.cc -- powerpc target support for gold. -// Copyright 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +// Copyright (C) 2008-2014 Free Software Foundation, Inc. // Written by David S. Miller // and David Edelsohn @@ -23,8 +23,10 @@ #include "gold.h" +#include #include #include "elfcpp.h" +#include "dwarf.h" #include "parameters.h" #include "reloc.h" #include "powerpc.h" @@ -60,6 +62,9 @@ class Output_data_glink; template class Stub_table; +inline bool +is_branch_reloc(unsigned int r_type); + template class Powerpc_relobj : public Sized_relobj_file { @@ -71,12 +76,20 @@ 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), opd_valid_(false), opd_ent_(), access_from_map_() - { } + special_(0), has_small_toc_reloc_(false), opd_valid_(false), + opd_ent_(), access_from_map_(), has14_(), stub_table_(), + e_flags_(ehdr.get_e_flags()), st_other_() + { + this->set_abiversion(0); + } ~Powerpc_relobj() { } + // Read the symbols then set up st_other vector. + void + do_read_symbols(Read_symbols_data*); + // The .got2 section shndx. unsigned int got2_shndx() const @@ -145,43 +158,6 @@ public: this->opd_ent_[ndx].discard = true; } - Access_from* - access_from_map() - { return &this->access_from_map_; } - - // Add a reference from SRC_OBJ, SRC_INDX to this object's .opd - // section at DST_OFF. - void - add_reference(Object* src_obj, - unsigned int src_indx, - typename elfcpp::Elf_types::Elf_Addr dst_off) - { - Section_id src_id(src_obj, src_indx); - this->access_from_map_[dst_off].insert(src_id); - } - - // Add a reference to the code section specified by the .opd entry - // at DST_OFF - void - add_gc_mark(typename elfcpp::Elf_types::Elf_Addr dst_off) - { - size_t ndx = this->opd_ent_ndx(dst_off); - if (ndx >= this->opd_ent_.size()) - this->opd_ent_.resize(ndx + 1); - this->opd_ent_[ndx].gc_mark = true; - } - - void - process_gc_mark(Symbol_table* symtab) - { - for (size_t i = 0; i < this->opd_ent_.size(); i++) - if (this->opd_ent_[i].gc_mark) - { - unsigned int shndx = this->opd_ent_[i].shndx; - symtab->gc()->worklist().push(Section_id(this, shndx)); - } - } - bool opd_valid() const { return this->opd_valid_; } @@ -220,6 +196,43 @@ public: return true; } + Access_from* + access_from_map() + { return &this->access_from_map_; } + + // Add a reference from SRC_OBJ, SRC_INDX to this object's .opd + // section at DST_OFF. + void + add_reference(Object* src_obj, + unsigned int src_indx, + typename elfcpp::Elf_types::Elf_Addr dst_off) + { + Section_id src_id(src_obj, src_indx); + this->access_from_map_[dst_off].insert(src_id); + } + + // Add a reference to the code section specified by the .opd entry + // at DST_OFF + void + add_gc_mark(typename elfcpp::Elf_types::Elf_Addr dst_off) + { + size_t ndx = this->opd_ent_ndx(dst_off); + if (ndx >= this->opd_ent_.size()) + this->opd_ent_.resize(ndx + 1); + this->opd_ent_[ndx].gc_mark = true; + } + + void + process_gc_mark(Symbol_table* symtab) + { + for (size_t i = 0; i < this->opd_ent_.size(); i++) + if (this->opd_ent_[i].gc_mark) + { + unsigned int shndx = this->opd_ent_[i].shndx; + symtab->gc()->worklist().push(Section_id(this, shndx)); + } + } + // Return offset in output GOT section that this object will use // as a TOC pointer. Won't be just a constant with multi-toc support. Address @@ -227,6 +240,14 @@ public: { return 0x8000; } void + set_has_small_toc_reloc() + { has_small_toc_reloc_ = true; } + + bool + has_small_toc_reloc() const + { return has_small_toc_reloc_; } + + void set_has_14bit_branch(unsigned int shndx) { if (shndx >= this->has14_.size()) @@ -254,6 +275,22 @@ public: return NULL; } + int + abiversion() const + { return this->e_flags_ & elfcpp::EF_PPC64_ABI; } + + // Set ABI version for input and output + void + set_abiversion(int ver); + + unsigned int + ppc64_local_entry_offset(const Symbol* sym) const + { return elfcpp::ppc64_decode_local_entry(sym->nonvis() >> 3); } + + unsigned int + ppc64_local_entry_offset(unsigned int symndx) const + { return elfcpp::ppc64_decode_local_entry(this->st_other_[symndx] >> 5); } + private: struct Opd_ent { @@ -280,6 +317,10 @@ private: // For 32-bit the .got2 section shdnx, for 64-bit the .opd section shndx. unsigned int special_; + // For 64-bit, whether this object uses small model relocs to access + // the toc. + bool has_small_toc_reloc_; + // Set at the start of gc_process_relocs, when we know opd_ent_ // vector is valid. The flag could be made atomic and set in // do_read_relocs with memory_order_release and then tested with @@ -303,6 +344,128 @@ private: // The stub table to use for a given input section. std::vector*> stub_table_; + + // Header e_flags + elfcpp::Elf_Word e_flags_; + + // ELF st_other field for local symbols. + std::vector st_other_; +}; + +template +class Powerpc_dynobj : public Sized_dynobj +{ +public: + typedef typename elfcpp::Elf_types::Elf_Addr Address; + + 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()) + { + this->set_abiversion(0); + } + + ~Powerpc_dynobj() + { } + + // Call Sized_dynobj::do_read_symbols to read the symbols then + // read .opd from a dynamic object, filling in opd_ent_ vector, + void + do_read_symbols(Read_symbols_data*); + + // The .opd section shndx. + unsigned int + opd_shndx() const + { + return this->opd_shndx_; + } + + // The .opd section address. + Address + opd_address() const + { + return this->opd_address_; + } + + // Init OPD entry arrays. + void + init_opd(size_t opd_size) + { + size_t count = this->opd_ent_ndx(opd_size); + this->opd_ent_.resize(count); + } + + // Return section and offset of function entry for .opd + R_OFF. + unsigned int + get_opd_ent(Address r_off, Address* value = NULL) const + { + size_t ndx = this->opd_ent_ndx(r_off); + gold_assert(ndx < this->opd_ent_.size()); + gold_assert(this->opd_ent_[ndx].shndx != 0); + if (value != NULL) + *value = this->opd_ent_[ndx].off; + return this->opd_ent_[ndx].shndx; + } + + // Set section and offset of function entry for .opd + R_OFF. + void + set_opd_ent(Address r_off, unsigned int shndx, Address value) + { + size_t ndx = this->opd_ent_ndx(r_off); + gold_assert(ndx < this->opd_ent_.size()); + this->opd_ent_[ndx].shndx = shndx; + this->opd_ent_[ndx].off = value; + } + + int + abiversion() const + { return this->e_flags_ & elfcpp::EF_PPC64_ABI; } + + // Set ABI version for input and output. + void + set_abiversion(int ver); + +private: + // Used to specify extent of executable sections. + struct Sec_info + { + Sec_info(Address start_, Address len_, unsigned int shndx_) + : start(start_), len(len_), shndx(shndx_) + { } + + bool + operator<(const Sec_info& that) const + { return this->start < that.start; } + + Address start; + Address len; + unsigned int shndx; + }; + + struct Opd_ent + { + unsigned int shndx; + Address off; + }; + + // Return index into opd_ent_ array for .opd entry at OFF. + size_t + opd_ent_ndx(size_t off) const + { return off >> 4;} + + // For 64-bit the .opd section shndx and address. + unsigned int opd_shndx_; + Address opd_address_; + + // 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_; }; template @@ -322,8 +485,9 @@ class Target_powerpc : public Sized_target : Sized_target(&powerpc_info), got_(NULL), plt_(NULL), iplt_(NULL), brlt_section_(NULL), glink_(NULL), rela_dyn_(NULL), copy_relocs_(elfcpp::R_POWERPC_COPY), - dynbss_(NULL), tlsld_got_offset_(-1U), - stub_tables_(), branch_lookup_table_(), branch_info_() + tlsld_got_offset_(-1U), + stub_tables_(), branch_lookup_table_(), branch_info_(), + plt_thread_safe_(false) { } @@ -380,6 +544,10 @@ class Target_powerpc : public Sized_target bool do_relax(int, const Input_objects*, Symbol_table*, Layout*, const Task*); + void + do_plt_fde_location(const Output_data*, unsigned char*, + uint64_t*, off_t*) const; + // Stash info about branches, for stub generation. void push_branch(Powerpc_relobj* ppc_object, @@ -429,6 +597,13 @@ class Target_powerpc : public Sized_target int64_t do_tls_offset_for_global(Symbol* gsym, unsigned int got_indx) const; + void + do_function_location(Symbol_location*) const; + + bool + do_can_check_for_function_pointers() const + { return true; } + // Relocate a section. void relocate_section(const Relocate_info*, @@ -512,6 +687,16 @@ class Target_powerpc : public Sized_target return this->glink_; } + Output_data_glink* + glink_section() + { + gold_assert(this->glink_ != NULL); + return this->glink_; + } + + bool has_glink() const + { return this->glink_ != NULL; } + // Get the GOT section. const Output_data_got_powerpc* got_section() const @@ -543,11 +728,25 @@ class Target_powerpc : public Sized_target // Return the offset of the first non-reserved PLT entry. unsigned int - first_plt_entry_offset() const; + first_plt_entry_offset() const + { + if (size == 32) + return 0; + if (this->abiversion() >= 2) + return 16; + return 24; + } // Return the size of each PLT entry. unsigned int - plt_entry_size() const; + plt_entry_size() const + { + if (size == 32) + return 4; + if (this->abiversion() >= 2) + return 8; + return 24; + } // Add any special sections for this symbol to the gc work list. // For powerpc64, this adds the code section of a function @@ -599,24 +798,134 @@ class Target_powerpc : public Sized_target p != this->branch_lookup_table_.end(); ++p) { - elfcpp::Swap<32, big_endian>::writeval(oview + p->second, p->first); + elfcpp::Swap::writeval(oview + p->second, p->first); } } + bool + plt_thread_safe() const + { return this->plt_thread_safe_; } + + int + abiversion () const + { return this->processor_specific_flags() & elfcpp::EF_PPC64_ABI; } + + void + set_abiversion (int ver) + { + elfcpp::Elf_Word flags = this->processor_specific_flags(); + flags &= ~elfcpp::EF_PPC64_ABI; + flags |= ver & elfcpp::EF_PPC64_ABI; + this->set_processor_specific_flags(flags); + } + + // Offset to to save stack slot + int + stk_toc () const + { return this->abiversion() < 2 ? 40 : 24; } + private: + class Track_tls + { + public: + enum Tls_get_addr + { + NOT_EXPECTED = 0, + EXPECTED = 1, + SKIP = 2, + NORMAL = 3 + }; + + Track_tls() + : tls_get_addr_(NOT_EXPECTED), + relinfo_(NULL), relnum_(0), r_offset_(0) + { } + + ~Track_tls() + { + if (this->tls_get_addr_ != NOT_EXPECTED) + this->missing(); + } + + void + missing(void) + { + if (this->relinfo_ != NULL) + gold_error_at_location(this->relinfo_, this->relnum_, this->r_offset_, + _("missing expected __tls_get_addr call")); + } + + void + expect_tls_get_addr_call( + const Relocate_info* relinfo, + size_t relnum, + Address r_offset) + { + this->tls_get_addr_ = EXPECTED; + this->relinfo_ = relinfo; + this->relnum_ = relnum; + this->r_offset_ = r_offset; + } + + void + expect_tls_get_addr_call() + { this->tls_get_addr_ = EXPECTED; } + + void + skip_next_tls_get_addr_call() + {this->tls_get_addr_ = SKIP; } + + Tls_get_addr + maybe_skip_tls_get_addr_call(unsigned int r_type, const Symbol* gsym) + { + bool is_tls_call = ((r_type == elfcpp::R_POWERPC_REL24 + || r_type == elfcpp::R_PPC_PLTREL24) + && gsym != NULL + && strcmp(gsym->name(), "__tls_get_addr") == 0); + Tls_get_addr last_tls = this->tls_get_addr_; + this->tls_get_addr_ = NOT_EXPECTED; + if (is_tls_call && last_tls != EXPECTED) + return last_tls; + else if (!is_tls_call && last_tls != NOT_EXPECTED) + { + this->missing(); + return EXPECTED; + } + return NORMAL; + } + + private: + // What we're up to regarding calls to __tls_get_addr. + // On powerpc, the branch and link insn making a call to + // __tls_get_addr is marked with a relocation, R_PPC64_TLSGD, + // R_PPC64_TLSLD, R_PPC_TLSGD or R_PPC_TLSLD, in addition to the + // usual R_POWERPC_REL24 or R_PPC_PLTREL25 relocation on a call. + // The marker relocation always comes first, and has the same + // symbol as the reloc on the insn setting up the __tls_get_addr + // argument. This ties the arg setup insn with the call insn, + // allowing ld to safely optimize away the call. We check that + // every call to __tls_get_addr has a marker relocation, and that + // every marker relocation is on a call to __tls_get_addr. + Tls_get_addr tls_get_addr_; + // Info about the last reloc for error message. + const Relocate_info* relinfo_; + size_t relnum_; + Address r_offset_; + }; + // The class which scans relocations. - class Scan + class Scan : protected Track_tls { public: typedef typename elfcpp::Elf_types::Elf_Addr Address; Scan() - : issued_non_pic_error_(false) + : Track_tls(), issued_non_pic_error_(false) { } static inline int - get_reference_flags(unsigned int r_type); + get_reference_flags(unsigned int r_type, const Target_powerpc* target); inline void local(Symbol_table* symtab, Layout* layout, Target_powerpc* target, @@ -638,24 +947,53 @@ class Target_powerpc : public Sized_target inline bool local_reloc_may_be_function_pointer(Symbol_table* , Layout* , Target_powerpc* , - Sized_relobj_file* , + Sized_relobj_file* relobj, unsigned int , Output_section* , const elfcpp::Rela& , - unsigned int , + unsigned int r_type, const elfcpp::Sym&) - { return false; } + { + // PowerPC64 .opd is not folded, so any identical function text + // may be folded and we'll still keep function addresses distinct. + // That means no reloc is of concern here. + if (size == 64) + { + Powerpc_relobj* ppcobj = static_cast + *>(relobj); + if (ppcobj->abiversion() == 1) + return false; + } + // For 32-bit and ELFv2, conservatively assume anything but calls to + // function code might be taking the address of the function. + return !is_branch_reloc(r_type); + } inline bool global_reloc_may_be_function_pointer(Symbol_table* , Layout* , Target_powerpc* , - Sized_relobj_file* , + Sized_relobj_file* relobj, unsigned int , Output_section* , - const elfcpp::Rela& , - unsigned int , Symbol*) - { return false; } + const elfcpp::Rela& , + unsigned int r_type, + Symbol*) + { + // As above. + if (size == 64) + { + Powerpc_relobj* ppcobj = static_cast + *>(relobj); + if (ppcobj->abiversion() == 1) + return false; + } + return !is_branch_reloc(r_type); + } + + static bool + reloc_needs_plt_for_ifunc(Target_powerpc* target, + Sized_relobj_file* object, + unsigned int r_type, bool report_err); private: static void @@ -673,47 +1011,28 @@ class Target_powerpc : public Sized_target void check_non_pic(Relobj*, unsigned int r_type); - bool - reloc_needs_plt_for_ifunc(Sized_relobj_file* object, - unsigned int r_type); - // Whether we have issued an error about a non-PIC compilation. bool issued_non_pic_error_; }; Address - symval_for_branch(Address value, const Sized_symbol* gsym, + symval_for_branch(const Symbol_table* symtab, Address value, + const Sized_symbol* gsym, Powerpc_relobj* object, unsigned int *dest_shndx); // The class which implements relocation. - class Relocate + class Relocate : protected Track_tls { public: // Use 'at' branch hints when true, 'y' when false. // FIXME maybe: set this with an option. static const bool is_isa_v2 = true; - enum skip_tls - { - CALL_NOT_EXPECTED = 0, - CALL_EXPECTED = 1, - CALL_SKIP = 2 - }; - Relocate() - : call_tls_get_addr_(CALL_NOT_EXPECTED) + : Track_tls() { } - ~Relocate() - { - if (this->call_tls_get_addr_ != CALL_NOT_EXPECTED) - { - // FIXME: This needs to specify the location somehow. - gold_error(_("missing expected __tls_get_addr call")); - } - } - // Do a relocation. Return false if the caller should not issue // any warnings about this relocation. inline bool @@ -725,10 +1044,6 @@ class Target_powerpc : public Sized_target unsigned char*, typename elfcpp::Elf_types::Elf_Addr, section_size_type); - - // This is set if we should skip the next reloc, which should be a - // call to __tls_get_addr. - enum skip_tls call_tls_get_addr_; }; class Relocate_comdat_behavior @@ -845,6 +1160,10 @@ class Target_powerpc : public Sized_target Reloc_section* rela_dyn_section(Layout*); + // Similarly, but for ifunc symbols get the one for ifunc. + Reloc_section* + rela_dyn_section(Symbol_table*, Layout*, bool for_ifunc); + // Copy a relocation against a global symbol. void copy_reloc(Symbol_table* symtab, Layout* layout, @@ -858,7 +1177,7 @@ class Target_powerpc : public Sized_target reloc, this->rela_dyn_section(layout)); } - // Look over all the input sections, deciding where to place stub. + // Look over all the input sections, deciding where to place stubs. void group_sections(Layout*, const Task*); @@ -921,9 +1240,30 @@ class Target_powerpc : public Sized_target // The GOT section. Output_data_got_powerpc* got_; - // The PLT section. + // The PLT section. This is a container for a table of addresses, + // and their relocations. Each address in the PLT has a dynamic + // relocation (R_*_JMP_SLOT) and each address will have a + // corresponding entry in .glink for lazy resolution of the PLT. + // ppc32 initialises the PLT to point at the .glink entry, while + // ppc64 leaves this to ld.so. To make a call via the PLT, the + // linker adds a stub that loads the PLT entry into ctr then + // branches to ctr. There may be more than one stub for each PLT + // entry. DT_JMPREL points at the first PLT dynamic relocation and + // DT_PLTRELSZ gives the total size of PLT dynamic relocations. Output_data_plt_powerpc* plt_; - // The IPLT section. + // The IPLT section. Like plt_, this is a container for a table of + // addresses and their relocations, specifically for STT_GNU_IFUNC + // functions that resolve locally (STT_GNU_IFUNC functions that + // don't resolve locally go in PLT). Unlike plt_, these have no + // entry in .glink for lazy resolution, and the relocation section + // does not have a 1-1 correspondence with IPLT addresses. In fact, + // the relocation section may contain relocations against + // STT_GNU_IFUNC symbols at locations outside of IPLT. The + // relocation section will appear at the end of other dynamic + // relocations, so that ld.so applies these relocations after other + // dynamic relocations. In a static executable, the relocation + // section is emitted and marked with __rela_iplt_start and + // __rela_iplt_end symbols. Output_data_plt_powerpc* iplt_; // Section holding long branch destinations. Output_data_brlt_powerpc* brlt_section_; @@ -933,8 +1273,6 @@ class Target_powerpc : public Sized_target Reloc_section* rela_dyn_; // Relocs saved to avoid a COPY reloc. Copy_relocs copy_relocs_; - // Space for variables copied with a COPY reloc. - Output_data_space* dynbss_; // Offset of the GOT entry for local dynamic __tls_get_addr calls. unsigned int tlsld_got_offset_; @@ -944,6 +1282,8 @@ class Target_powerpc : public Sized_target typedef std::vector Branches; Branches branch_info_; + + bool plt_thread_safe_; }; template<> @@ -969,7 +1309,8 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info = 0, // small_common_section_flags 0, // large_common_section_flags NULL, // attributes_section - NULL // attributes_vendor + NULL, // attributes_vendor + "_start" // entry_symbol_name }; template<> @@ -995,7 +1336,8 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info = 0, // small_common_section_flags 0, // large_common_section_flags NULL, // attributes_section - NULL // attributes_vendor + NULL, // attributes_vendor + "_start" // entry_symbol_name }; template<> @@ -1021,7 +1363,8 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info = 0, // small_common_section_flags 0, // large_common_section_flags NULL, // attributes_section - NULL // attributes_vendor + NULL, // attributes_vendor + "_start" // entry_symbol_name }; template<> @@ -1047,7 +1390,8 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info = 0, // small_common_section_flags 0, // large_common_section_flags NULL, // attributes_section - NULL // attributes_vendor + NULL, // attributes_vendor + "_start" // entry_symbol_name }; inline bool @@ -1103,102 +1447,6 @@ at_tls_transform(uint32_t insn, unsigned int reg) return insn; } -// Modified version of symtab.h class Symbol member -// Given a direct absolute or pc-relative static relocation against -// the global symbol, this function returns whether a dynamic relocation -// is needed. - -template -bool -needs_dynamic_reloc(const Symbol* gsym, int flags) -{ - // No dynamic relocations in a static link! - if (parameters->doing_static_link()) - return false; - - // A reference to an undefined symbol from an executable should be - // statically resolved to 0, and does not need a dynamic relocation. - // This matches gnu ld behavior. - if (gsym->is_undefined() && !parameters->options().shared()) - return false; - - // A reference to an absolute symbol does not need a dynamic relocation. - if (gsym->is_absolute()) - return false; - - // An absolute reference within a position-independent output file - // will need a dynamic relocation. - if ((flags & Symbol::ABSOLUTE_REF) - && parameters->options().output_is_position_independent()) - return true; - - // A function call that can branch to a local PLT entry does not need - // a dynamic relocation. - if ((flags & Symbol::FUNCTION_CALL) && gsym->has_plt_offset()) - return false; - - // A reference to any PLT entry in a non-position-independent executable - // does not need a dynamic relocation. - // Except due to having function descriptors on powerpc64 we don't define - // functions to their plt code in an executable, so this doesn't apply. - if (size == 32 - && !parameters->options().output_is_position_independent() - && gsym->has_plt_offset()) - return false; - - // A reference to a symbol defined in a dynamic object or to a - // symbol that is preemptible will need a dynamic relocation. - if (gsym->is_from_dynobj() - || gsym->is_undefined() - || gsym->is_preemptible()) - return true; - - // For all other cases, return FALSE. - return false; -} - -// Modified version of symtab.h class Symbol member -// Whether we should use the PLT offset associated with a symbol for -// a relocation. FLAGS is a set of Reference_flags. - -template -bool -use_plt_offset(const Symbol* gsym, int flags) -{ - // If the symbol doesn't have a PLT offset, then naturally we - // don't want to use it. - if (!gsym->has_plt_offset()) - return false; - - // For a STT_GNU_IFUNC symbol we always have to use the PLT entry. - if (gsym->type() == elfcpp::STT_GNU_IFUNC) - return true; - - // If we are going to generate a dynamic relocation, then we will - // wind up using that, so no need to use the PLT entry. - if (needs_dynamic_reloc(gsym, flags)) - return false; - - // If the symbol is from a dynamic object, we need to use the PLT - // entry. - if (gsym->is_from_dynobj()) - return true; - - // If we are generating a shared object, and gsym symbol is - // undefined or preemptible, we need to use the PLT entry. - if (parameters->options().shared() - && (gsym->is_undefined() || gsym->is_preemptible())) - return true; - - // If gsym is a call to a weak undefined symbol, we need to use - // the PLT entry; the symbol may be defined by a library loaded - // at runtime. - if ((flags & Symbol::FUNCTION_CALL) && gsym->is_weak_undefined()) - return true; - - // Otherwise we can use the regular definition. - return false; -} template class Powerpc_relocate_functions @@ -1208,7 +1456,10 @@ public: { CHECK_NONE, CHECK_SIGNED, - CHECK_BITFIELD + CHECK_UNSIGNED, + CHECK_BITFIELD, + CHECK_LOW_INSN, + CHECK_HIGH_INSN }; enum Status @@ -1234,12 +1485,20 @@ private: template static inline bool - has_overflow_bitfield(Address value) + has_overflow_unsigned(Address value) { Address limit = static_cast
(1) << ((valsize - 1) >> 1); limit <<= ((valsize - 1) >> 1); limit <<= ((valsize - 1) - 2 * ((valsize - 1) >> 1)); - return value > (limit << 1) - 1 && value + limit > (limit << 1) - 1; + return value > (limit << 1) - 1; + } + + template + static inline bool + has_overflow_bitfield(Address value) + { + return (has_overflow_unsigned(value) + && has_overflow_signed(value)); } template @@ -1251,6 +1510,11 @@ private: if (has_overflow_signed(value)) return STATUS_OVERFLOW; } + else if (overflow == CHECK_UNSIGNED) + { + if (has_overflow_unsigned(value)) + return STATUS_OVERFLOW; + } else if (overflow == CHECK_BITFIELD) { if (has_overflow_bitfield(value)) @@ -1260,58 +1524,58 @@ private: } // Do a simple RELA relocation - template + template static inline Status rela(unsigned char* view, Address value, Overflow_check overflow) { - typedef typename elfcpp::Swap::Valtype Valtype; + typedef typename elfcpp::Swap::Valtype Valtype; Valtype* wv = reinterpret_cast(view); - elfcpp::Swap::writeval(wv, value); + elfcpp::Swap::writeval(wv, value); return overflowed(value, overflow); } - template + template static inline Status rela(unsigned char* view, unsigned int right_shift, - typename elfcpp::Valtype_base::Valtype dst_mask, + typename elfcpp::Valtype_base::Valtype dst_mask, Address value, Overflow_check overflow) { - typedef typename elfcpp::Swap::Valtype Valtype; + typedef typename elfcpp::Swap::Valtype Valtype; Valtype* wv = reinterpret_cast(view); - Valtype val = elfcpp::Swap::readval(wv); + Valtype val = elfcpp::Swap::readval(wv); Valtype reloc = value >> right_shift; val &= ~dst_mask; reloc &= dst_mask; - elfcpp::Swap::writeval(wv, val | reloc); + elfcpp::Swap::writeval(wv, val | reloc); return overflowed(value >> right_shift, overflow); } // Do a simple RELA relocation, unaligned. - template + template static inline Status rela_ua(unsigned char* view, Address value, Overflow_check overflow) { - elfcpp::Swap_unaligned::writeval(view, value); + elfcpp::Swap_unaligned::writeval(view, value); return overflowed(value, overflow); } - template + template static inline Status rela_ua(unsigned char* view, unsigned int right_shift, - typename elfcpp::Valtype_base::Valtype dst_mask, + typename elfcpp::Valtype_base::Valtype dst_mask, Address value, Overflow_check overflow) { - typedef typename elfcpp::Swap_unaligned::Valtype + typedef typename elfcpp::Swap_unaligned::Valtype Valtype; - Valtype val = elfcpp::Swap::readval(view); + Valtype val = elfcpp::Swap::readval(view); Valtype reloc = value >> right_shift; val &= ~dst_mask; reloc &= dst_mask; - elfcpp::Swap_unaligned::writeval(view, val | reloc); + elfcpp::Swap_unaligned::writeval(view, val | reloc); return overflowed(value >> right_shift, overflow); } @@ -1319,28 +1583,29 @@ public: // R_PPC64_ADDR64: (Symbol + Addend) static inline void addr64(unsigned char* view, Address value) - { This::template rela<64>(view, value, CHECK_NONE); } + { This::template rela<64,64>(view, value, CHECK_NONE); } // R_PPC64_UADDR64: (Symbol + Addend) unaligned static inline void addr64_u(unsigned char* view, Address value) - { This::template rela_ua<64>(view, value, CHECK_NONE); } + { This::template rela_ua<64,64>(view, value, CHECK_NONE); } // R_POWERPC_ADDR32: (Symbol + Addend) static inline Status addr32(unsigned char* view, Address value, Overflow_check overflow) - { return This::template rela<32>(view, value, overflow); } + { return This::template rela<32,32>(view, value, overflow); } // R_POWERPC_UADDR32: (Symbol + Addend) unaligned static inline Status addr32_u(unsigned char* view, Address value, Overflow_check overflow) - { return This::template rela_ua<32>(view, value, overflow); } + { return This::template rela_ua<32,32>(view, value, overflow); } // R_POWERPC_ADDR24: (Symbol + Addend) & 0x3fffffc static inline Status addr24(unsigned char* view, Address value, Overflow_check overflow) { - Status stat = This::template rela<32>(view, 0, 0x03fffffc, value, overflow); + Status stat = This::template rela<32,26>(view, 0, 0x03fffffc, + value, overflow); if (overflow != CHECK_NONE && (value & 3) != 0) stat = STATUS_OVERFLOW; return stat; @@ -1349,18 +1614,18 @@ public: // R_POWERPC_ADDR16: (Symbol + Addend) & 0xffff static inline Status addr16(unsigned char* view, Address value, Overflow_check overflow) - { return This::template rela<16>(view, value, overflow); } + { return This::template rela<16,16>(view, value, overflow); } // R_POWERPC_ADDR16: (Symbol + Addend) & 0xffff, unaligned static inline Status addr16_u(unsigned char* view, Address value, Overflow_check overflow) - { return This::template rela_ua<16>(view, value, overflow); } + { return This::template rela_ua<16,16>(view, value, overflow); } // R_POWERPC_ADDR16_DS: (Symbol + Addend) & 0xfffc static inline Status addr16_ds(unsigned char* view, Address value, Overflow_check overflow) { - Status stat = This::template rela<16>(view, 0, 0xfffc, value, overflow); + Status stat = This::template rela<16,16>(view, 0, 0xfffc, value, overflow); if (overflow != CHECK_NONE && (value & 3) != 0) stat = STATUS_OVERFLOW; return stat; @@ -1369,7 +1634,7 @@ public: // R_POWERPC_ADDR16_HI: ((Symbol + Addend) >> 16) & 0xffff static inline void addr16_hi(unsigned char* view, Address value) - { This::template rela<16>(view, 16, 0xffff, value, CHECK_NONE); } + { This::template rela<16,16>(view, 16, 0xffff, value, CHECK_NONE); } // R_POWERPC_ADDR16_HA: ((Symbol + Addend + 0x8000) >> 16) & 0xffff static inline void @@ -1379,7 +1644,7 @@ public: // R_POWERPC_ADDR16_HIGHER: ((Symbol + Addend) >> 32) & 0xffff static inline void addr16_hi2(unsigned char* view, Address value) - { This::template rela<16>(view, 32, 0xffff, value, CHECK_NONE); } + { This::template rela<16,16>(view, 32, 0xffff, value, CHECK_NONE); } // R_POWERPC_ADDR16_HIGHERA: ((Symbol + Addend + 0x8000) >> 32) & 0xffff static inline void @@ -1389,7 +1654,7 @@ public: // R_POWERPC_ADDR16_HIGHEST: ((Symbol + Addend) >> 48) & 0xffff static inline void addr16_hi3(unsigned char* view, Address value) - { This::template rela<16>(view, 48, 0xffff, value, CHECK_NONE); } + { This::template rela<16,16>(view, 48, 0xffff, value, CHECK_NONE); } // R_POWERPC_ADDR16_HIGHESTA: ((Symbol + Addend + 0x8000) >> 48) & 0xffff static inline void @@ -1400,13 +1665,36 @@ public: static inline Status addr14(unsigned char* view, Address value, Overflow_check overflow) { - Status stat = This::template rela<32>(view, 0, 0xfffc, value, overflow); + Status stat = This::template rela<32,16>(view, 0, 0xfffc, value, overflow); if (overflow != CHECK_NONE && (value & 3) != 0) stat = STATUS_OVERFLOW; return stat; } }; +// Set ABI version for input and output. + +template +void +Powerpc_relobj::set_abiversion(int ver) +{ + this->e_flags_ |= ver; + if (this->abiversion() != 0) + { + Target_powerpc* target = + static_cast*>( + parameters->sized_target()); + if (target->abiversion() == 0) + target->set_abiversion(this->abiversion()); + else if (target->abiversion() != this->abiversion()) + gold_error(_("%s: ABI version %d is not compatible " + "with ABI version %d output"), + this->name().c_str(), + this->abiversion(), target->abiversion()); + + } +} + // Stash away the index of .got2 or .opd in a relocatable object, if // such a section exists. @@ -1421,12 +1709,21 @@ Powerpc_relobj::do_find_special_sections( section_size_type names_size = sd->section_names_size; const unsigned char* s; - s = this->find_shdr(pshdrs, size == 32 ? ".got2" : ".opd", - names, names_size, NULL); + s = this->template find_shdr(pshdrs, + size == 32 ? ".got2" : ".opd", + names, names_size, NULL); if (s != NULL) { unsigned int ndx = (s - pshdrs) / elfcpp::Elf_sizes::shdr_size; this->special_ = ndx; + if (size == 64) + { + if (this->abiversion() == 0) + this->set_abiversion(1); + else if (this->abiversion() > 1) + gold_error(_("%s: .opd invalid in abiv%d"), + this->name().c_str(), this->abiversion()); + } } return Sized_relobj_file::do_find_special_sections(sd); } @@ -1537,6 +1834,174 @@ Powerpc_relobj::do_read_relocs(Read_relocs_data* rd) } } +// Read the symbols then set up st_other vector. + +template +void +Powerpc_relobj::do_read_symbols(Read_symbols_data* sd) +{ + this->base_read_symbols(sd); + if (size == 64) + { + const int shdr_size = elfcpp::Elf_sizes::shdr_size; + const unsigned char* const pshdrs = sd->section_headers->data(); + const unsigned int loccount = this->do_local_symbol_count(); + if (loccount != 0) + { + this->st_other_.resize(loccount); + const int sym_size = elfcpp::Elf_sizes::sym_size; + off_t locsize = loccount * sym_size; + const unsigned int symtab_shndx = this->symtab_shndx(); + const unsigned char *psymtab = pshdrs + symtab_shndx * shdr_size; + typename elfcpp::Shdr shdr(psymtab); + const unsigned char* psyms = this->get_view(shdr.get_sh_offset(), + locsize, true, false); + psyms += sym_size; + for (unsigned int i = 1; i < loccount; ++i, psyms += sym_size) + { + elfcpp::Sym sym(psyms); + unsigned char st_other = sym.get_st_other(); + this->st_other_[i] = st_other; + if ((st_other & elfcpp::STO_PPC64_LOCAL_MASK) != 0) + { + if (this->abiversion() == 0) + this->set_abiversion(2); + else if (this->abiversion() < 2) + gold_error(_("%s: local symbol %d has invalid st_other" + " for ABI version 1"), + this->name().c_str(), i); + } + } + } + } +} + +template +void +Powerpc_dynobj::set_abiversion(int ver) +{ + this->e_flags_ |= ver; + if (this->abiversion() != 0) + { + Target_powerpc* target = + static_cast*>( + parameters->sized_target()); + if (target->abiversion() == 0) + target->set_abiversion(this->abiversion()); + else if (target->abiversion() != this->abiversion()) + gold_error(_("%s: ABI version %d is not compatible " + "with ABI version %d output"), + this->name().c_str(), + this->abiversion(), target->abiversion()); + + } +} + +// Call Sized_dynobj::base_read_symbols to read the symbols then +// read .opd from a dynamic object, filling in opd_ent_ vector, + +template +void +Powerpc_dynobj::do_read_symbols(Read_symbols_data* sd) +{ + this->base_read_symbols(sd); + 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); + const unsigned char* s = NULL; + const unsigned char* opd; + section_size_type opd_size; + + // Find and read .opd section. + while (1) + { + s = this->template find_shdr(pshdrs, ".opd", names, + sd->section_names_size, + s); + if (s == NULL) + return; + + typename elfcpp::Shdr shdr(s); + if (shdr.get_sh_type() == elfcpp::SHT_PROGBITS + && (shdr.get_sh_flags() & elfcpp::SHF_ALLOC) != 0) + { + if (this->abiversion() == 0) + this->set_abiversion(1); + else if (this->abiversion() > 1) + gold_error(_("%s: .opd invalid in abiv%d"), + this->name().c_str(), this->abiversion()); + + this->opd_shndx_ = (s - pshdrs) / shdr_size; + this->opd_address_ = shdr.get_sh_addr(); + opd_size = convert_to_section_size_type(shdr.get_sh_size()); + opd = this->get_view(shdr.get_sh_offset(), opd_size, + true, false); + break; + } + } + + // Build set of executable sections. + // Using a set is probably overkill. There is likely to be only + // a few executable sections, typically .init, .text and .fini, + // and they are generally grouped together. + typedef std::set Exec_sections; + Exec_sections exec_sections; + s = pshdrs; + for (unsigned int i = 1; i < this->shnum(); ++i, s += shdr_size) + { + typename elfcpp::Shdr shdr(s); + if (shdr.get_sh_type() == elfcpp::SHT_PROGBITS + && ((shdr.get_sh_flags() + & (elfcpp::SHF_ALLOC | elfcpp::SHF_EXECINSTR)) + == (elfcpp::SHF_ALLOC | elfcpp::SHF_EXECINSTR)) + && shdr.get_sh_size() != 0) + { + exec_sections.insert(Sec_info(shdr.get_sh_addr(), + shdr.get_sh_size(), i)); + } + } + if (exec_sections.empty()) + return; + + // Look over the OPD entries. This is complicated by the fact + // that some binaries will use two-word entries while others + // will use the standard three-word entries. In most cases + // the third word (the environment pointer for languages like + // Pascal) is unused and will be zero. If the third word is + // used it should not be pointing into executable sections, + // I think. + this->init_opd(opd_size); + for (const unsigned char* p = opd; p < opd + opd_size; p += 8) + { + typedef typename elfcpp::Swap<64, big_endian>::Valtype Valtype; + const Valtype* valp = reinterpret_cast(p); + Valtype val = elfcpp::Swap<64, big_endian>::readval(valp); + if (val == 0) + // Chances are that this is the third word of an OPD entry. + continue; + typename Exec_sections::const_iterator e + = exec_sections.upper_bound(Sec_info(val, 0, 0)); + if (e != exec_sections.begin()) + { + --e; + if (e->start <= val && val < e->start + e->len) + { + // We have an address in an executable section. + // VAL ought to be the function entry, set it up. + this->set_opd_ent(p - opd, e->shndx, val); + // Skip second word of OPD entry, the TOC pointer. + p += 8; + } + } + // If we didn't match any executable sections, we likely + // have a non-zero third word in the OPD entry. + } + } +} + // Set up some symbols. template @@ -1580,9 +2045,29 @@ Target_powerpc::do_define_standard_symbols( sdata, ORDER_SMALL_DATA, false); symtab->define_in_output_data("_SDA_BASE_", NULL, Symbol_table::PREDEFINED, - os, 32768, 0, elfcpp::STT_OBJECT, - elfcpp::STB_LOCAL, elfcpp::STV_HIDDEN, - 0, false, false); + os, 32768, 0, elfcpp::STT_OBJECT, + elfcpp::STB_LOCAL, elfcpp::STV_HIDDEN, + 0, false, false); + } + } + else + { + // Define .TOC. as for 32-bit _GLOBAL_OFFSET_TABLE_ + Symbol *gotsym = symtab->lookup(".TOC.", NULL); + if (gotsym != NULL && gotsym->is_undefined()) + { + Target_powerpc* target = + static_cast*>( + parameters->sized_target()); + Output_data_got_powerpc* got + = target->got_section(symtab, layout); + symtab->define_in_output_data(".TOC.", NULL, + Symbol_table::PREDEFINED, + got, 0x8000, 0, + elfcpp::STT_OBJECT, + elfcpp::STB_LOCAL, + elfcpp::STV_HIDDEN, 0, + false, false); } } } @@ -1609,8 +2094,8 @@ Target_powerpc::do_make_elf_object( } else if (et == elfcpp::ET_DYN) { - Sized_dynobj* obj = - new Sized_dynobj(name, input_file, offset, ehdr); + Powerpc_dynobj* obj = + new Powerpc_dynobj(name, input_file, offset, ehdr); obj->setup(); return obj; } @@ -1633,34 +2118,90 @@ public: symtab_(symtab), layout_(layout), header_ent_cnt_(size == 32 ? 3 : 1), header_index_(size == 32 ? 0x2000 : 0) - {} + { } - class Got_entry; + // Override all the Output_data_got methods we use so as to first call + // reserve_ent(). + bool + add_global(Symbol* gsym, unsigned int got_type) + { + this->reserve_ent(); + return Output_data_got::add_global(gsym, got_type); + } - // Create a new GOT entry and return its offset. - unsigned int - add_got_entry(Got_entry got_entry) + bool + add_global_plt(Symbol* gsym, unsigned int got_type) { this->reserve_ent(); - return Output_data_got::add_got_entry(got_entry); + return Output_data_got::add_global_plt(gsym, got_type); } - // Create a pair of new GOT entries and return the offset of the first. - unsigned int - add_got_entry_pair(Got_entry got_entry_1, Got_entry got_entry_2) + bool + add_global_tls(Symbol* gsym, unsigned int got_type) + { return this->add_global_plt(gsym, got_type); } + + void + add_global_with_rel(Symbol* gsym, unsigned int got_type, + Output_data_reloc_generic* rel_dyn, unsigned int r_type) + { + this->reserve_ent(); + Output_data_got:: + add_global_with_rel(gsym, got_type, rel_dyn, r_type); + } + + void + add_global_pair_with_rel(Symbol* gsym, unsigned int got_type, + Output_data_reloc_generic* rel_dyn, + unsigned int r_type_1, unsigned int r_type_2) + { + this->reserve_ent(2); + Output_data_got:: + add_global_pair_with_rel(gsym, got_type, rel_dyn, r_type_1, r_type_2); + } + + bool + add_local(Relobj* object, unsigned int sym_index, unsigned int got_type) + { + this->reserve_ent(); + return Output_data_got::add_local(object, sym_index, + got_type); + } + + bool + add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type) + { + this->reserve_ent(); + return Output_data_got::add_local_plt(object, sym_index, + got_type); + } + + bool + add_local_tls(Relobj* object, unsigned int sym_index, unsigned int got_type) + { return this->add_local_plt(object, sym_index, got_type); } + + void + add_local_tls_pair(Relobj* object, unsigned int sym_index, + unsigned int got_type, + Output_data_reloc_generic* rel_dyn, + unsigned int r_type) { this->reserve_ent(2); - return Output_data_got::add_got_entry_pair(got_entry_1, - got_entry_2); + Output_data_got:: + add_local_tls_pair(object, sym_index, got_type, rel_dyn, r_type); + } + + unsigned int + add_constant(Valtype constant) + { + this->reserve_ent(); + return Output_data_got::add_constant(constant); } unsigned int add_constant_pair(Valtype c1, Valtype c2) { this->reserve_ent(2); - unsigned int got_offset = this->add_constant(c1); - this->add_constant(c2); - return got_offset; + return Output_data_got::add_constant_pair(c1, c2); } // Offset of _GLOBAL_OFFSET_TABLE_. @@ -1797,6 +2338,22 @@ Target_powerpc::rela_dyn_section(Layout* layout) return this->rela_dyn_; } +// Similarly, but for ifunc symbols get the one for ifunc. + +template +typename Target_powerpc::Reloc_section* +Target_powerpc::rela_dyn_section(Symbol_table* symtab, + Layout* layout, + bool for_ifunc) +{ + if (!for_ifunc) + return this->rela_dyn_section(layout); + + if (this->iplt_ == NULL) + this->make_iplt_section(symtab, layout); + return this->iplt_->rel_plt(); +} + class Stub_control { public: @@ -1806,7 +2363,7 @@ class Stub_control // the stubbed branches. Stub_control(int32_t size) : state_(NO_GROUP), stub_group_size_(abs(size)), - stub14_group_size_(abs(size)), + stub14_group_size_(abs(size) >> 10), stubs_always_before_branch_(size < 0), suppress_size_errors_(false), group_end_addr_(0), owner_(NULL), output_section_(NULL) { @@ -1842,6 +2399,14 @@ class Stub_control output_section() { return output_section_; } + void + set_output_and_owner(Output_section* o, + const Output_section::Input_section* i) + { + this->output_section_ = o; + this->owner_ = i; + } + private: typedef enum { @@ -1860,7 +2425,7 @@ class Stub_control Output_section* output_section_; }; -// Return true iff input section can be handled by current stub/ +// Return true iff input section can be handled by current stub // group. bool @@ -1892,7 +2457,9 @@ Stub_control::can_add_to_stub_group(Output_section* o, i->relobj()->section_name(i->shndx()).c_str()); if (this->state_ != HAS_STUB_SECTION - && (!whole_sec || this->output_section_ != o)) + && (!whole_sec || this->output_section_ != o) + && (this->state_ == NO_GROUP + || this->group_end_addr_ - end_addr < group_size)) { this->owner_ = i; this->output_section_ = o; @@ -1956,6 +2523,7 @@ Target_powerpc::group_sections(Layout* layout, { stub_table->init(stub_control.owner(), stub_control.output_section()); + stub_control.set_output_and_owner(*o, &*i); stub_table = NULL; } if (stub_table == NULL) @@ -1965,7 +2533,25 @@ Target_powerpc::group_sections(Layout* layout, } } if (stub_table != NULL) - stub_table->init(stub_control.owner(), stub_control.output_section()); + { + const Output_section::Input_section* i = stub_control.owner(); + if (!i->is_input_section()) + { + // Corner case. A new stub group was made for the first + // section (last one looked at here) for some reason, but + // the first section is already being used as the owner for + // a stub table for following sections. Force it into that + // stub group. + gold_assert(this->stub_tables_.size() >= 2); + this->stub_tables_.pop_back(); + delete stub_table; + Powerpc_relobj* ppcobj = static_cast + *>(i->relobj()); + ppcobj->set_stub_table(i->shndx(), this->stub_tables_.back()); + } + else + stub_table->init(i, stub_control.output_section()); + } } // If this branch needs a plt call stub, or a long branch stub, make one. @@ -1981,28 +2567,40 @@ Target_powerpc::Branch_info::make_stub( 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 (gsym != NULL - ? use_plt_offset(gsym, Scan::get_reference_flags(this->r_type_)) + ? gsym->use_plt_offset(Scan::get_reference_flags(this->r_type_, target)) : this->object_->local_has_plt_offset(this->r_sym_)) { - if (stub_table == NULL) - stub_table = this->object_->stub_table(this->shndx_); - if (stub_table == NULL) + if (size == 64 + && gsym != NULL + && target->abiversion() >= 2 + && !parameters->options().output_is_position_independent() + && !is_branch_reloc(this->r_type_)) + target->glink_section()->add_global_entry(gsym); + else { - // This is a ref from a data section to an ifunc symbol. - stub_table = ifunc_stub_table; + if (stub_table == NULL) + stub_table = this->object_->stub_table(this->shndx_); + if (stub_table == NULL) + { + // This is a ref from a data section to an ifunc symbol. + stub_table = ifunc_stub_table; + } + gold_assert(stub_table != NULL); + if (gsym != NULL) + stub_table->add_plt_call_entry(this->object_, gsym, + this->r_type_, this->addend_); + else + stub_table->add_plt_call_entry(this->object_, this->r_sym_, + this->r_type_, this->addend_); } - gold_assert(stub_table != NULL); - if (gsym != NULL) - stub_table->add_plt_call_entry(this->object_, gsym, - this->r_type_, this->addend_); - else - stub_table->add_plt_call_entry(this->object_, this->r_sym_, - this->r_type_, this->addend_); } else { - unsigned int max_branch_offset; + unsigned long max_branch_offset; if (this->r_type_ == elfcpp::R_POWERPC_REL14 || this->r_type_ == elfcpp::R_POWERPC_REL14_BRTAKEN || this->r_type_ == elfcpp::R_POWERPC_REL14_BRNTAKEN) @@ -2045,6 +2643,8 @@ Target_powerpc::Branch_info::make_stub( to = symtab->compute_final_value(gsym, &status); if (status != Symbol_table::CFVS_OK) return; + if (size == 64) + to += this->object_->ppc64_local_entry_offset(gsym); } else { @@ -2059,19 +2659,29 @@ Target_powerpc::Branch_info::make_stub( || !symval.has_output_value()) return; to = symval.value(this->object_, 0); + if (size == 64) + to += this->object_->ppc64_local_entry_offset(this->r_sym_); } + to += this->addend_; if (stub_table == NULL) stub_table = this->object_->stub_table(this->shndx_); - gold_assert(stub_table != NULL); - if (size == 64 && is_branch_reloc(this->r_type_)) + if (size == 64 && target->abiversion() < 2) { unsigned int dest_shndx; - to = stub_table->targ()->symval_for_branch(to, gsym, this->object_, - &dest_shndx); + to = target->symval_for_branch(symtab, to, gsym, + this->object_, &dest_shndx); } Address delta = to - from; if (delta + max_branch_offset >= 2 * max_branch_offset) { + if (stub_table == NULL) + { + gold_warning(_("%s:%s: branch in non-executable section," + " no long branch stub for you"), + this->object_->name().c_str(), + this->object_->section_name(this->shndx_).c_str()); + return; + } stub_table->add_long_branch_entry(this->object_, to); } } @@ -2089,17 +2699,60 @@ Target_powerpc::do_relax(int pass, { unsigned int prev_brlt_size = 0; if (pass == 1) - this->group_sections(layout, task); - else { - prev_brlt_size = this->branch_lookup_table_.size(); - this->branch_lookup_table_.clear(); - for (typename Stub_tables::iterator p = this->stub_tables_.begin(); - p != this->stub_tables_.end(); - ++p) + bool thread_safe + = this->abiversion() < 2 && parameters->options().plt_thread_safe(); + if (size == 64 + && this->abiversion() < 2 + && !thread_safe + && !parameters->options().user_set_plt_thread_safe()) { - (*p)->clear_long_branch_stubs(); + static const char* const thread_starter[] = + { + "pthread_create", + /* libstdc++ */ + "_ZNSt6thread15_M_start_threadESt10shared_ptrINS_10_Impl_baseEE", + /* librt */ + "aio_init", "aio_read", "aio_write", "aio_fsync", "lio_listio", + "mq_notify", "create_timer", + /* libanl */ + "getaddrinfo_a", + /* libgomp */ + "GOMP_parallel", + "GOMP_parallel_start", + "GOMP_parallel_loop_static", + "GOMP_parallel_loop_static_start", + "GOMP_parallel_loop_dynamic", + "GOMP_parallel_loop_dynamic_start", + "GOMP_parallel_loop_guided", + "GOMP_parallel_loop_guided_start", + "GOMP_parallel_loop_runtime", + "GOMP_parallel_loop_runtime_start", + "GOMP_parallel_sections", + "GOMP_parallel_sections_start", + /* libgo */ + "__go_go", + }; + + if (parameters->options().shared()) + thread_safe = true; + else + { + for (unsigned int i = 0; + i < sizeof(thread_starter) / sizeof(thread_starter[0]); + i++) + { + Symbol* sym = symtab->lookup(thread_starter[i], NULL); + thread_safe = (sym != NULL + && sym->in_reg() + && sym->in_real_elf()); + if (thread_safe) + break; + } + } } + this->plt_thread_safe_ = thread_safe; + this->group_sections(layout, task); } // We need address of stub tables valid for make_stub. @@ -2115,6 +2768,20 @@ Target_powerpc::do_relax(int pass, (*p)->set_address_and_size(os, off); } + if (pass != 1) + { + // Clear plt call stubs, long branch stubs and branch lookup table. + prev_brlt_size = this->branch_lookup_table_.size(); + this->branch_lookup_table_.clear(); + for (typename Stub_tables::iterator p = this->stub_tables_.begin(); + p != this->stub_tables_.end(); + ++p) + { + (*p)->clear_stubs(); + } + } + + // Build all the stubs. Stub_table* ifunc_stub_table = this->stub_tables_.size() == 0 ? NULL : this->stub_tables_[0]; Stub_table* one_stub_table @@ -2126,6 +2793,7 @@ Target_powerpc::do_relax(int pass, b->make_stub(one_stub_table, ifunc_stub_table, symtab); } + // Did anything change size? unsigned int num_huge_branches = this->branch_lookup_table_.size(); bool again = num_huge_branches != prev_brlt_size; if (size == 64 && num_huge_branches != 0) @@ -2142,10 +2810,14 @@ Target_powerpc::do_relax(int pass, if ((*p)->size_update()) { again = true; + (*p)->add_eh_frame(layout); os_need_update.insert((*p)->output_section()); } } + // Set output section offsets for all input sections in an output + // section that just changed size. Anything past the stubs will + // need updating. for (typename Output_sections::iterator p = os_need_update.begin(); p != os_need_update.end(); p++) @@ -2170,8 +2842,8 @@ Target_powerpc::do_relax(int pass, else off += i->data_size(); } - // If .brlt is part of this output section, then we have just - // done the offset adjustment. + // If .branch_lt is part of this output section, then we have + // just done the offset adjustment. os->clear_section_offsets_need_adjustment(); } @@ -2181,7 +2853,7 @@ Target_powerpc::do_relax(int pass, && parameters->options().output_is_position_independent()) { // Fill in the BRLT relocs. - this->brlt_section_->reset_data_size(); + this->brlt_section_->reset_brlt_sizes(); for (typename Branch_lookup_table::const_iterator p = this->branch_lookup_table_.begin(); p != this->branch_lookup_table_.end(); @@ -2189,11 +2861,73 @@ Target_powerpc::do_relax(int pass, { this->brlt_section_->add_reloc(p->first, p->second); } - this->brlt_section_->finalize_data_size(); + this->brlt_section_->finalize_brlt_sizes(); } return again; } +template +void +Target_powerpc::do_plt_fde_location(const Output_data* plt, + unsigned char* oview, + uint64_t* paddress, + off_t* plen) const +{ + uint64_t address = plt->address(); + off_t len = plt->data_size(); + + if (plt == this->glink_) + { + // See Output_data_glink::do_write() for glink contents. + if (len == 0) + { + gold_assert(parameters->doing_static_link()); + // Static linking may need stubs, to support ifunc and long + // branches. We need to create an output section for + // .eh_frame early in the link process, to have a place to + // attach stub .eh_frame info. We also need to have + // registered a CIE that matches the stub CIE. Both of + // these requirements are satisfied by creating an FDE and + // CIE for .glink, even though static linking will leave + // .glink zero length. + // ??? Hopefully generating an FDE with a zero address range + // won't confuse anything that consumes .eh_frame info. + } + else if (size == 64) + { + // There is one word before __glink_PLTresolve + address += 8; + len -= 8; + } + else if (parameters->options().output_is_position_independent()) + { + // 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; + if (oview[9] == elfcpp::DW_CFA_nop) + len -= resolve_size; + else + { + address += len - resolve_size; + len = resolve_size; + } + } + } + else + { + // Must be a stub table. + const Stub_table* stub_table + = static_cast*>(plt); + uint64_t stub_address = stub_table->stub_address(); + len -= stub_address - address; + address = stub_address; + } + + *paddress = address; + *plen = len; +} + // A class to handle the PLT data. template @@ -2205,12 +2939,10 @@ class Output_data_plt_powerpc : public Output_section_data_build Output_data_plt_powerpc(Target_powerpc* targ, Reloc_section* plt_rel, - unsigned int reserved_size, const char* name) : Output_section_data_build(size == 32 ? 4 : 8), rel_(plt_rel), targ_(targ), - initial_plt_entry_size_(reserved_size), name_(name) { } @@ -2235,20 +2967,12 @@ class Output_data_plt_powerpc : public Output_section_data_build unsigned int entry_count() const { - return ((this->current_data_size() - this->initial_plt_entry_size_) - / plt_entry_size); + if (this->current_data_size() == 0) + return 0; + return ((this->current_data_size() - this->first_plt_entry_offset()) + / this->plt_entry_size()); } - // Return the offset of the first non-reserved PLT entry. - unsigned int - first_plt_entry_offset() - { return this->initial_plt_entry_size_; } - - // Return the size of a PLT entry. - static unsigned int - get_plt_entry_size() - { return plt_entry_size; } - protected: void do_adjust_output_section(Output_section* os) @@ -2262,8 +2986,22 @@ class Output_data_plt_powerpc : public Output_section_data_build { mapfile->print_output_data(this, this->name_); } private: - // The size of an entry in the PLT. - static const int plt_entry_size = size == 32 ? 4 : 24; + // Return the offset of the first non-reserved PLT entry. + unsigned int + first_plt_entry_offset() const + { + // IPLT has no reserved entry. + if (this->name_[3] == 'I') + return 0; + return this->targ_->first_plt_entry_offset(); + } + + // Return the size of each PLT entry. + unsigned int + plt_entry_size() const + { + return this->targ_->plt_entry_size(); + } // Write out the PLT data. void @@ -2273,8 +3011,6 @@ class Output_data_plt_powerpc : public Output_section_data_build Reloc_section* rel_; // Allows access to .glink for do_write. Target_powerpc* targ_; - // The size of the first reserved entry. - int initial_plt_entry_size_; // What to report in map file. const char *name_; }; @@ -2294,7 +3030,7 @@ Output_data_plt_powerpc::add_entry(Symbol* gsym) gsym->set_needs_dynsym_entry(); unsigned int dynrel = elfcpp::R_POWERPC_JMP_SLOT; this->rel_->add_global(gsym, dynrel, this, off, 0); - off += plt_entry_size; + off += this->plt_entry_size(); this->set_current_data_size(off); } } @@ -2310,10 +3046,10 @@ Output_data_plt_powerpc::add_ifunc_entry(Symbol* gsym) section_size_type off = this->current_data_size(); gsym->set_plt_offset(off); unsigned int dynrel = elfcpp::R_POWERPC_IRELATIVE; - if (size == 64) + if (size == 64 && this->targ_->abiversion() < 2) dynrel = elfcpp::R_PPC64_JMP_IREL; this->rel_->add_symbolless_global_addend(gsym, dynrel, this, off, 0); - off += plt_entry_size; + off += this->plt_entry_size(); this->set_current_data_size(off); } } @@ -2331,60 +3067,66 @@ Output_data_plt_powerpc::add_local_ifunc_entry( section_size_type off = this->current_data_size(); relobj->set_local_plt_offset(local_sym_index, off); unsigned int dynrel = elfcpp::R_POWERPC_IRELATIVE; - if (size == 64) + if (size == 64 && this->targ_->abiversion() < 2) dynrel = elfcpp::R_PPC64_JMP_IREL; this->rel_->add_symbolless_local_addend(relobj, local_sym_index, dynrel, this, off, 0); - off += plt_entry_size; + off += this->plt_entry_size(); this->set_current_data_size(off); } } static const uint32_t add_0_11_11 = 0x7c0b5a14; +static const uint32_t add_2_2_11 = 0x7c425a14; static const uint32_t add_3_3_2 = 0x7c631214; static const uint32_t add_3_3_13 = 0x7c636a14; static const uint32_t add_11_0_11 = 0x7d605a14; -static const uint32_t add_12_2_11 = 0x7d825a14; -static const uint32_t addi_11_11 = 0x396b0000; -static const uint32_t addi_12_12 = 0x398c0000; +static const uint32_t add_11_2_11 = 0x7d625a14; +static const uint32_t add_11_11_2 = 0x7d6b1214; +static const uint32_t addi_0_12 = 0x380c0000; static const uint32_t addi_2_2 = 0x38420000; -static const uint32_t addi_3_2 = 0x38620000; static const uint32_t addi_3_3 = 0x38630000; +static const uint32_t addi_11_11 = 0x396b0000; +static const uint32_t addi_12_12 = 0x398c0000; static const uint32_t addis_0_2 = 0x3c020000; static const uint32_t addis_0_13 = 0x3c0d0000; +static const uint32_t addis_3_2 = 0x3c620000; +static const uint32_t addis_3_13 = 0x3c6d0000; +static const uint32_t addis_11_2 = 0x3d620000; static const uint32_t addis_11_11 = 0x3d6b0000; static const uint32_t addis_11_30 = 0x3d7e0000; -static const uint32_t addis_12_12 = 0x3d8c0000; static const uint32_t addis_12_2 = 0x3d820000; -static const uint32_t addis_3_2 = 0x3c620000; -static const uint32_t addis_3_13 = 0x3c6d0000; +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 blr = 0x4e800020; -static const uint32_t blrl = 0x4e800021; +static const uint32_t bnectr_p4 = 0x4ce20420; +static const uint32_t cmpldi_2_0 = 0x28220000; 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; static const uint32_t ld_0_12 = 0xe80c0000; -static const uint32_t ld_11_12 = 0xe96c0000; -static const uint32_t ld_11_2 = 0xe9620000; static const uint32_t ld_2_1 = 0xe8410000; -static const uint32_t ld_2_11 = 0xe84b0000; -static const uint32_t ld_2_12 = 0xe84c0000; static const uint32_t ld_2_2 = 0xe8420000; +static const uint32_t ld_2_11 = 0xe84b0000; +static const uint32_t ld_11_2 = 0xe9620000; +static const uint32_t ld_11_11 = 0xe96b0000; +static const uint32_t ld_12_2 = 0xe9820000; +static const uint32_t ld_12_11 = 0xe98b0000; +static const uint32_t ld_12_12 = 0xe98c0000; static const uint32_t lfd_0_1 = 0xc8010000; static const uint32_t li_0_0 = 0x38000000; static const uint32_t li_12_0 = 0x39800000; static const uint32_t lis_0_0 = 0x3c000000; 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_11 = 0x816b0000; static const uint32_t lwz_11_30 = 0x817e0000; static const uint32_t lwz_12_12 = 0x818c0000; static const uint32_t lwzu_0_12 = 0x840c0000; -static const uint32_t lvx_0_12_0 = 0x7c0c00ce; static const uint32_t mflr_0 = 0x7c0802a6; static const uint32_t mflr_11 = 0x7d6802a6; static const uint32_t mflr_12 = 0x7d8802a6; @@ -2395,12 +3137,16 @@ static const uint32_t mtlr_0 = 0x7c0803a6; static const uint32_t mtlr_12 = 0x7d8803a6; static const uint32_t nop = 0x60000000; static const uint32_t ori_0_0_0 = 0x60000000; +static const uint32_t 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 stfd_0_1 = 0xd8010000; static const uint32_t stvx_0_12_0 = 0x7c0c01ce; static const uint32_t sub_11_11_12 = 0x7d6c5850; +static const uint32_t sub_12_12_11 = 0x7d8b6050; +static const uint32_t xor_2_12_12 = 0x7d826278; +static const uint32_t xor_11_12_12 = 0x7d8b6278; // Write out the PLT. @@ -2408,7 +3154,7 @@ template void Output_data_plt_powerpc::do_write(Output_file* of) { - if (size == 32) + if (size == 32 && this->name_[3] != 'I') { const section_size_type offset = this->offset(); const section_size_type oview_size @@ -2450,7 +3196,7 @@ Target_powerpc::make_plt_section(Symbol_table* symtab, // Ensure that .rela.dyn always appears before .rela.plt This is // necessary due to how, on PowerPC and some other targets, .rela.dyn - // needs to include .rela.plt in it's range. + // needs to include .rela.plt in its range. this->rela_dyn_section(layout); Reloc_section* plt_rel = new Reloc_section(false); @@ -2459,7 +3205,6 @@ Target_powerpc::make_plt_section(Symbol_table* symtab, ORDER_DYNAMIC_PLT_RELOCS, false); this->plt_ = new Output_data_plt_powerpc(this, plt_rel, - size == 32 ? 0 : 24, "** PLT"); layout->add_output_section_data(".plt", (size == 32 @@ -2489,7 +3234,7 @@ Target_powerpc::make_iplt_section(Symbol_table* symtab, this->rela_dyn_->output_section()->add_output_section_data(iplt_rel); this->iplt_ = new Output_data_plt_powerpc(this, iplt_rel, - 0, "** IPLT"); + "** IPLT"); this->plt_->output_section()->add_output_section_data(this->iplt_); } } @@ -2511,6 +3256,20 @@ class Output_data_brlt_powerpc : public Output_section_data_build targ_(targ) { } + void + reset_brlt_sizes() + { + this->reset_data_size(); + this->rel_->reset_data_size(); + } + + void + finalize_brlt_sizes() + { + this->finalize_data_size(); + this->rel_->finalize_data_size(); + } + // Add a reloc for an entry in the BRLT. void add_reloc(Address to, unsigned int off) @@ -2571,8 +3330,8 @@ 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 .brlt (like .plt it can be a - // bss style section) but must initialise at runtime via + // 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. this->rela_dyn_section(layout); brlt_rel = new Reloc_section(false); @@ -2584,7 +3343,7 @@ Target_powerpc::make_brlt_section(Layout* layout) this->plt_->output_section() ->add_output_section_data(this->brlt_section_); else - layout->add_output_section_data(".brlt", + layout->add_output_section_data(".branch_lt", (is_pic ? elfcpp::SHT_NOBITS : elfcpp::SHT_PROGBITS), elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE, @@ -2595,7 +3354,7 @@ Target_powerpc::make_brlt_section(Layout* layout) } } -// Write out .brlt when non-PIC. +// Write out .branch_lt when non-PIC. template void @@ -2613,6 +3372,97 @@ Output_data_brlt_powerpc::do_write(Output_file* of) } } +static inline uint32_t +l(uint32_t a) +{ + return a & 0xffff; +} + +static inline uint32_t +hi(uint32_t a) +{ + return l(a >> 16); +} + +static inline uint32_t +ha(uint32_t a) +{ + return hi(a + 0x8000); +} + +template +struct Eh_cie +{ + static const unsigned char eh_frame_cie[12]; +}; + +template +const unsigned char Eh_cie::eh_frame_cie[] = +{ + 1, // CIE version. + 'z', 'R', 0, // Augmentation string. + 4, // Code alignment. + 0x80 - size / 8 , // Data alignment. + 65, // RA reg. + 1, // Augmentation size. + (elfcpp::DW_EH_PE_pcrel + | elfcpp::DW_EH_PE_sdata4), // FDE encoding. + elfcpp::DW_CFA_def_cfa, 1, 0 // def_cfa: r1 offset 0. +}; + +// Describe __glink_PLTresolve use of LR, 64-bit version ABIv1. +static const unsigned char glink_eh_frame_fde_64v1[] = +{ + 0, 0, 0, 0, // Replaced with offset to .glink. + 0, 0, 0, 0, // Replaced with size of .glink. + 0, // Augmentation size. + elfcpp::DW_CFA_advance_loc + 1, + elfcpp::DW_CFA_register, 65, 12, + elfcpp::DW_CFA_advance_loc + 4, + elfcpp::DW_CFA_restore_extended, 65 +}; + +// Describe __glink_PLTresolve use of LR, 64-bit version ABIv2. +static const unsigned char glink_eh_frame_fde_64v2[] = +{ + 0, 0, 0, 0, // Replaced with offset to .glink. + 0, 0, 0, 0, // Replaced with size of .glink. + 0, // Augmentation size. + elfcpp::DW_CFA_advance_loc + 1, + elfcpp::DW_CFA_register, 65, 0, + elfcpp::DW_CFA_advance_loc + 4, + elfcpp::DW_CFA_restore_extended, 65 +}; + +// Describe __glink_PLTresolve use of LR, 32-bit version. +static const unsigned char glink_eh_frame_fde_32[] = +{ + 0, 0, 0, 0, // Replaced with offset to .glink. + 0, 0, 0, 0, // Replaced with size of .glink. + 0, // Augmentation size. + elfcpp::DW_CFA_advance_loc + 2, + elfcpp::DW_CFA_register, 65, 0, + elfcpp::DW_CFA_advance_loc + 4, + elfcpp::DW_CFA_restore_extended, 65 +}; + +static const unsigned char default_fde[] = +{ + 0, 0, 0, 0, // Replaced with offset to stubs. + 0, 0, 0, 0, // Replaced with size of stubs. + 0, // Augmentation size. + elfcpp::DW_CFA_nop, // Pad. + elfcpp::DW_CFA_nop, + elfcpp::DW_CFA_nop +}; + +template +static inline void +write_insn(unsigned char* p, uint32_t v) +{ + elfcpp::Swap<32, big_endian>::writeval(p, v); +} + // 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 @@ -2628,7 +3478,8 @@ class Stub_table : public Output_relaxed_input_section Stub_table(Target_powerpc* targ) : Output_relaxed_input_section(NULL, 0, 0), targ_(targ), plt_call_stubs_(), long_branch_stubs_(), - orig_data_size_(0), plt_size_(0), branch_size_(0), prev_size_(0) + orig_data_size_(0), plt_size_(0), last_plt_size_(0), + branch_size_(0), last_branch_size_(0), eh_frame_added_(false) { } // Delayed Output_relaxed_input_section init. @@ -2673,11 +3524,14 @@ class Stub_table : public Output_relaxed_input_section add_long_branch_entry(const Powerpc_relobj*, Address); Address - find_long_branch_entry(const Powerpc_relobj*, Address); + find_long_branch_entry(const Powerpc_relobj*, + Address) const; void - clear_long_branch_stubs() + clear_stubs() { + this->plt_call_stubs_.clear(); + this->plt_size_ = 0; this->long_branch_stubs_.clear(); this->branch_size_ = 0; } @@ -2700,14 +3554,14 @@ class Stub_table : public Output_relaxed_input_section } Address - stub_address() + stub_address() const { return align_address(this->address() + this->orig_data_size_, this->stub_align()); } Address - stub_offset() + stub_offset() const { return align_address(this->offset() + this->orig_data_size_, this->stub_align()); @@ -2738,42 +3592,127 @@ class Stub_table : public Output_relaxed_input_section // a suitably aligned address. os->checkpoint_set_addralign(this->stub_align()); } - if (this->prev_size_ != this->plt_size_ + this->branch_size_) + if (this->last_plt_size_ != this->plt_size_ + || this->last_branch_size_ != this->branch_size_) { - this->prev_size_ = this->plt_size_ + this->branch_size_; + this->last_plt_size_ = this->plt_size_; + this->last_branch_size_ = this->branch_size_; return true; } return false; } - section_size_type - prev_size() const - { return this->prev_size_; } - + // 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. void - set_prev_size(section_size_type val) - { this->prev_size_ = val; } + add_eh_frame(Layout* layout) + { + if (!this->eh_frame_added_) + { + if (!parameters->options().ld_generated_unwind_info()) + return; + + // Since we add stub .eh_frame info late, it must be placed + // after all other linker generated .eh_frame info so that + // merge mapping need not be updated for input sections. + // There is no provision to use a different CIE to that used + // by .glink. + if (!this->targ_->has_glink()) + return; + + 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; + } + } Target_powerpc* targ() const { return targ_; } private: + class Plt_stub_ent; + class Plt_stub_ent_hash; + typedef Unordered_map Plt_stub_entries; + + // Alignment of stub section. unsigned int - stub_align() - { return size == 32 ? 16 : 32; } + stub_align() const + { + if (size == 32) + return 16; + unsigned int min_align = 32; + 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 + { + 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(); + } + 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); + } + } - // We keep plt stubs aligned, so no fancy sizing. + // Size of a given plt call stub. unsigned int - plt_call_size() const - { return size == 32 ? 16 : 32; } + plt_call_size(typename Plt_stub_entries::const_iterator p) const + { + if (size == 32) + return 16; + + bool is_iplt; + Address plt_addr = this->plt_off(p, &is_iplt); + if (is_iplt) + plt_addr += this->targ_->iplt_section()->address(); + else + plt_addr += this->targ_->plt_section()->address(); + Address got_addr = this->targ_->got_section()->output_section()->address(); + const Powerpc_relobj* ppcobj = static_cast + *>(p->first.object_); + got_addr += ppcobj->toc_base_offset(); + Address off = plt_addr - got_addr; + unsigned int bytes = 4 * 4 + 4 * (ha(off) != 0); + if (this->targ_->abiversion() < 2) + { + bool static_chain = parameters->options().plt_static_chain(); + bool thread_safe = this->targ_->plt_thread_safe(); + bytes += (4 + + 4 * static_chain + + 8 * thread_safe + + 4 * (ha(off + 8 + 8 * static_chain) != ha(off))); + } + unsigned int align = 1 << parameters->options().plt_align(); + if (align > 1) + bytes = (bytes + align - 1) & -align; + return bytes; + } // Return long branch stub size. unsigned int branch_stub_size(Address to) { - Address loc = this->stub_address() + this->plt_size_ + this->branch_size_; - if (loc - to + (1 << 25) < 2 << 25) + Address loc + = this->stub_address() + this->last_plt_size_ + this->branch_size_; + if (to - loc + (1 << 25) < 2 << 25) return 4; if (size == 64 || !parameters->options().output_is_position_independent()) return 16; @@ -2885,8 +3824,6 @@ class Stub_table : public Output_relaxed_input_section // In a sane world this would be a global. Target_powerpc* targ_; // Map sym/object/addend to stub offset. - typedef Unordered_map Plt_stub_entries; Plt_stub_entries plt_call_stubs_; // Map destination address to stub offset. typedef Unordered_map::add_plt_call_entry( Address addend) { Plt_stub_ent ent(object, gsym, r_type, addend); - Address off = this->plt_size_; - if (this->plt_call_stubs_.insert(std::make_pair(ent, off)).second) - this->plt_size_ = off + this->plt_call_size(); + unsigned int off = this->plt_size_; + std::pair p + = this->plt_call_stubs_.insert(std::make_pair(ent, off)); + if (p.second) + this->plt_size_ = off + this->plt_call_size(p.first); } template @@ -2956,15 +3897,17 @@ Stub_table::add_plt_call_entry( Address addend) { Plt_stub_ent ent(object, locsym_index, r_type, addend); - Address off = this->plt_size_; - if (this->plt_call_stubs_.insert(std::make_pair(ent, off)).second) - this->plt_size_ = off + this->plt_call_size(); + unsigned int off = this->plt_size_; + std::pair p + = this->plt_call_stubs_.insert(std::make_pair(ent, off)); + if (p.second) + this->plt_size_ = off + this->plt_call_size(p.first); } // Find a plt call stub. template -typename elfcpp::Elf_types::Elf_Addr +typename Stub_table::Address Stub_table::find_plt_call_entry( const Sized_relobj_file* object, const Symbol* gsym, @@ -2977,7 +3920,7 @@ Stub_table::find_plt_call_entry( } template -typename elfcpp::Elf_types::Elf_Addr +typename Stub_table::Address Stub_table::find_plt_call_entry(const Symbol* gsym) const { Plt_stub_ent ent(gsym); @@ -2986,7 +3929,7 @@ Stub_table::find_plt_call_entry(const Symbol* gsym) const } template -typename elfcpp::Elf_types::Elf_Addr +typename Stub_table::Address Stub_table::find_plt_call_entry( const Sized_relobj_file* object, unsigned int locsym_index, @@ -2999,7 +3942,7 @@ Stub_table::find_plt_call_entry( } template -typename elfcpp::Elf_types::Elf_Addr +typename Stub_table::Address Stub_table::find_plt_call_entry( const Sized_relobj_file* object, unsigned int locsym_index) const @@ -3032,10 +3975,10 @@ Stub_table::add_long_branch_entry( // Find long branch stub. template -typename elfcpp::Elf_types::Elf_Addr +typename Stub_table::Address Stub_table::find_long_branch_entry( const Powerpc_relobj* object, - Address to) + Address to) const { Branch_stub_ent ent(object, to); typename Branch_stub_entries::const_iterator p @@ -3049,11 +3992,31 @@ template class Output_data_glink : public Output_section_data { public: + typedef typename elfcpp::Elf_types::Elf_Addr Address; + static const Address invalid_address = static_cast
(0) - 1; static const int pltresolve_size = 16*4; - Output_data_glink(Target_powerpc* targ) - : Output_section_data(16), targ_(targ) - { } + Output_data_glink(Target_powerpc* targ) + : Output_section_data(16), targ_(targ), global_entry_stubs_(), + end_branch_table_(), ge_size_(0) + { } + + void + add_eh_frame(Layout* layout); + + void + add_global_entry(const Symbol*); + + Address + find_global_entry(const Symbol*) const; + + 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; + } protected: // Write to a map file. @@ -3071,10 +4034,76 @@ class Output_data_glink : public Output_section_data // Allows access to .got and .plt for do_write. Target_powerpc* targ_; + + // Map sym to stub offset. + typedef Unordered_map Global_entry_stub_entries; + Global_entry_stub_entries global_entry_stubs_; + + unsigned int end_branch_table_, ge_size_; }; template void +Output_data_glink::add_eh_frame(Layout* layout) +{ + if (!parameters->options().ld_generated_unwind_info()) + return; + + if (size == 64) + { + if (this->targ_->abiversion() < 2) + layout->add_eh_frame_for_plt(this, + Eh_cie<64>::eh_frame_cie, + sizeof (Eh_cie<64>::eh_frame_cie), + glink_eh_frame_fde_64v1, + sizeof (glink_eh_frame_fde_64v1)); + else + layout->add_eh_frame_for_plt(this, + Eh_cie<64>::eh_frame_cie, + sizeof (Eh_cie<64>::eh_frame_cie), + glink_eh_frame_fde_64v2, + sizeof (glink_eh_frame_fde_64v2)); + } + else + { + // 32-bit .glink can use the default since the CIE return + // address reg, LR, is valid. + layout->add_eh_frame_for_plt(this, + Eh_cie<32>::eh_frame_cie, + sizeof (Eh_cie<32>::eh_frame_cie), + default_fde, + sizeof (default_fde)); + // Except where LR is used in a PIC __glink_PLTresolve. + if (parameters->options().output_is_position_independent()) + layout->add_eh_frame_for_plt(this, + Eh_cie<32>::eh_frame_cie, + sizeof (Eh_cie<32>::eh_frame_cie), + glink_eh_frame_fde_32, + sizeof (glink_eh_frame_fde_32)); + } +} + +template +void +Output_data_glink::add_global_entry(const Symbol* gsym) +{ + std::pair p + = this->global_entry_stubs_.insert(std::make_pair(gsym, this->ge_size_)); + if (p.second) + this->ge_size_ += 16; +} + +template +typename Output_data_glink::Address +Output_data_glink::find_global_entry(const Symbol* gsym) const +{ + typename Global_entry_stub_entries::const_iterator p + = this->global_entry_stubs_.find(gsym); + return p == this->global_entry_stubs_.end() ? invalid_address : p->second; +} + +template +void Output_data_glink::set_final_data_size() { unsigned int count = this->targ_->plt_entry_count(); @@ -3095,40 +4124,22 @@ Output_data_glink::set_final_data_size() total += this->pltresolve_size; // space for branch table - total += 8 * count; - if (count > 0x8000) - total += 4 * (count - 0x8000); + total += 4 * count; + if (this->targ_->abiversion() < 2) + { + total += 4 * count; + if (count > 0x8000) + total += 4 * (count - 0x8000); + } } } + this->end_branch_table_ = total; + total = (total + 15) & -16; + total += this->ge_size_; this->set_data_size(total); } -static inline uint32_t -l(uint32_t a) -{ - return a & 0xffff; -} - -static inline uint32_t -hi(uint32_t a) -{ - return l(a >> 16); -} - -static inline uint32_t -ha(uint32_t a) -{ - return hi(a + 0x8000); -} - -template -static inline void -write_insn(unsigned char* p, uint32_t v) -{ - elfcpp::Swap<32, big_endian>::writeval(p, v); -} - // Write out plt and long branch stub code. template @@ -3146,9 +4157,6 @@ Stub_table::do_write(Output_file* of) unsigned char* const oview = of->get_output_view(off, oview_size); unsigned char* p; - typedef typename elfcpp::Elf_types::Elf_Addr Address; - static const Address invalid_address = static_cast
(0) - 1; - if (size == 64) { const Output_data_got_powerpc* got @@ -3167,24 +4175,10 @@ Stub_table::do_write(Output_file* of) cs != this->plt_call_stubs_.end(); ++cs) { - Address plt_addr; - bool is_ifunc; - const Symbol* gsym = cs->first.sym_; - if (gsym != NULL) - { - is_ifunc = (gsym->type() == elfcpp::STT_GNU_IFUNC - && gsym->can_use_relative_reloc(false)); - plt_addr = gsym->plt_offset(); - } - else - { - is_ifunc = true; - const Sized_relobj_file* relobj - = cs->first.object_; - unsigned int local_sym_index = cs->first.locsym_; - plt_addr = relobj->local_plt_offset(local_sym_index); - } - if (is_ifunc) + 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(); @@ -3195,43 +4189,130 @@ Stub_table::do_write(Output_file* of) const Powerpc_relobj* ppcobj = static_cast *>(cs->first.object_); Address got_addr = got_os_addr + ppcobj->toc_base_offset(); - Address pltoff = plt_addr - got_addr; + Address off = plt_addr - got_addr; - if (pltoff + 0x80008000 > 0xffffffff || (pltoff & 7) != 0) + if (off + 0x80008000 > 0xffffffff || (off & 7) != 0) gold_error(_("%s: linkage table error against `%s'"), cs->first.object_->name().c_str(), cs->first.sym_->demangled_name().c_str()); + bool plt_load_toc = this->targ_->abiversion() < 2; + bool static_chain + = plt_load_toc && parameters->options().plt_static_chain(); + bool thread_safe + = plt_load_toc && this->targ_->plt_thread_safe(); + bool use_fake_dep = false; + Address cmp_branch_off = 0; + if (thread_safe) + { + unsigned int pltindex + = ((pltoff - this->targ_->first_plt_entry_offset()) + / this->targ_->plt_entry_size()); + Address glinkoff + = (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 + + 4 * (ha(off) != 0) + + 4 * (ha(off + 8 + 8 * static_chain) != ha(off)) + + 4 * static_chain); + cmp_branch_off = to - from; + use_fake_dep = cmp_branch_off + (1 << 25) >= (1 << 26); + } + p = oview + cs->second; - if (ha(pltoff) != 0) + if (ha(off) != 0) { - write_insn(p, addis_12_2 + ha(pltoff)), p += 4; - write_insn(p, std_2_1 + 40), p += 4; - write_insn(p, ld_11_12 + l(pltoff)), p += 4; - if (ha(pltoff + 16) != ha(pltoff)) + write_insn(p, std_2_1 + this->targ_->stk_toc()); + p += 4; + if (plt_load_toc) + { + write_insn(p, addis_11_2 + ha(off)); + p += 4; + write_insn(p, ld_12_11 + l(off)); + p += 4; + } + else + { + write_insn(p, addis_12_2 + ha(off)); + p += 4; + write_insn(p, ld_12_12 + l(off)); + p += 4; + } + if (plt_load_toc + && ha(off + 8 + 8 * static_chain) != ha(off)) + { + write_insn(p, addi_11_11 + l(off)); + p += 4; + off = 0; + } + write_insn(p, mtctr_12); + p += 4; + if (plt_load_toc) { - write_insn(p, addi_12_12 + l(pltoff)),p += 4; - pltoff = 0; + if (use_fake_dep) + { + write_insn(p, xor_2_12_12); + p += 4; + write_insn(p, add_11_11_2); + p += 4; + } + write_insn(p, ld_2_11 + l(off + 8)); + p += 4; + if (static_chain) + { + write_insn(p, ld_11_11 + l(off + 16)); + p += 4; + } } - write_insn(p, mtctr_11), p += 4; - write_insn(p, ld_2_12 + l(pltoff + 8)), p += 4; - write_insn(p, ld_11_12 + l(pltoff + 16)), p += 4; - write_insn(p, bctr); } else { - write_insn(p, std_2_1 + 40), p += 4; - write_insn(p, ld_11_2 + l(pltoff)), p += 4; - if (ha(pltoff + 16) != ha(pltoff)) + write_insn(p, std_2_1 + this->targ_->stk_toc()); + p += 4; + write_insn(p, ld_12_2 + l(off)); + p += 4; + if (plt_load_toc + && ha(off + 8 + 8 * static_chain) != ha(off)) + { + write_insn(p, addi_2_2 + l(off)); + p += 4; + off = 0; + } + write_insn(p, mtctr_12); + p += 4; + if (plt_load_toc) { - write_insn(p, addi_2_2 + l(pltoff)), p += 4; - pltoff = 0; + if (use_fake_dep) + { + write_insn(p, xor_11_12_12); + p += 4; + write_insn(p, add_2_2_11); + p += 4; + } + if (static_chain) + { + write_insn(p, ld_11_2 + l(off + 16)); + p += 4; + } + write_insn(p, ld_2_2 + l(off + 8)); + p += 4; } - write_insn(p, mtctr_11), p += 4; - write_insn(p, ld_11_2 + l(pltoff + 16)), p += 4; - write_insn(p, ld_2_2 + l(pltoff + 8)), p += 4; - write_insn(p, bctr); } + if (thread_safe && !use_fake_dep) + { + write_insn(p, cmpldi_2_0); + p += 4; + write_insn(p, bnectr_p4); + p += 4; + write_insn(p, b | (cmp_branch_off & 0x3fffffc)); + } + else + write_insn(p, bctr); } } @@ -3256,14 +4337,14 @@ Stub_table::do_write(Output_file* of) Address brltoff = brlt_addr - got_addr; if (ha(brltoff) == 0) { - write_insn(p, ld_11_2 + l(brltoff)), p += 4; + write_insn(p, ld_12_2 + l(brltoff)), p += 4; } else { write_insn(p, addis_12_2 + ha(brltoff)), p += 4; - write_insn(p, ld_11_12 + l(brltoff)), p += 4; + write_insn(p, ld_12_12 + l(brltoff)), p += 4; } - write_insn(p, mtctr_11), p += 4; + write_insn(p, mtctr_12), p += 4; write_insn(p, bctr); } } @@ -3284,24 +4365,9 @@ Stub_table::do_write(Output_file* of) cs != this->plt_call_stubs_.end(); ++cs) { - Address plt_addr; - bool is_ifunc; - const Symbol* gsym = cs->first.sym_; - if (gsym != NULL) - { - is_ifunc = (gsym->type() == elfcpp::STT_GNU_IFUNC - && gsym->can_use_relative_reloc(false)); - plt_addr = gsym->plt_offset(); - } - else - { - is_ifunc = true; - const Sized_relobj_file* relobj - = cs->first.object_; - unsigned int local_sym_index = cs->first.locsym_; - plt_addr = relobj->local_plt_offset(local_sym_index); - } - if (is_ifunc) + bool is_iplt; + Address plt_addr = this->plt_off(cs, &is_iplt); + if (is_iplt) { if (iplt_base == invalid_address) iplt_base = this->targ_->iplt_section()->address(); @@ -3336,17 +4402,17 @@ Stub_table::do_write(Output_file* of) got_addr = g_o_t; } - Address pltoff = plt_addr - got_addr; - if (ha(pltoff) == 0) + Address off = plt_addr - got_addr; + if (ha(off) == 0) { - write_insn(p + 0, lwz_11_30 + l(pltoff)); + write_insn(p + 0, lwz_11_30 + l(off)); write_insn(p + 4, mtctr_11); write_insn(p + 8, bctr); } else { - write_insn(p + 0, addis_11_30 + ha(pltoff)); - write_insn(p + 4, lwz_11_11 + l(pltoff)); + 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); } @@ -3413,43 +4479,101 @@ Output_data_glink::do_write(Output_file* of) if (size == 64) { - // Write pltresolve stub. - p = oview; - Address after_bcl = this->address() + 16; - Address pltoff = plt_base - after_bcl; - - elfcpp::Swap<64, big_endian>::writeval(p, pltoff), p += 8; - - write_insn(p, mflr_12), p += 4; - write_insn(p, bcl_20_31), p += 4; - write_insn(p, mflr_11), p += 4; - write_insn(p, ld_2_11 + l(-16)), p += 4; - write_insn(p, mtlr_12), p += 4; - write_insn(p, add_12_2_11), p += 4; - write_insn(p, ld_11_12 + 0), p += 4; - write_insn(p, ld_2_12 + 8), p += 4; - write_insn(p, mtctr_11), p += 4; - write_insn(p, ld_11_12 + 16), p += 4; - write_insn(p, bctr), p += 4; - while (p < oview + this->pltresolve_size) - write_insn(p, nop), p += 4; - - // Write lazy link call stubs. - uint32_t indx = 0; - while (p < oview + oview_size) + if (this->end_branch_table_ != 0) { - if (indx < 0x8000) + // Write pltresolve stub. + p = oview; + Address after_bcl = this->address() + 16; + Address pltoff = plt_base - after_bcl; + + elfcpp::Swap<64, big_endian>::writeval(p, pltoff), p += 8; + + if (this->targ_->abiversion() < 2) { - write_insn(p, li_0_0 + indx), p += 4; + write_insn(p, mflr_12), p += 4; + write_insn(p, bcl_20_31), p += 4; + write_insn(p, mflr_11), p += 4; + write_insn(p, ld_2_11 + l(-16)), p += 4; + write_insn(p, mtlr_12), p += 4; + write_insn(p, add_11_2_11), p += 4; + write_insn(p, ld_12_11 + 0), p += 4; + write_insn(p, ld_2_11 + 8), p += 4; + write_insn(p, mtctr_12), p += 4; + write_insn(p, ld_11_11 + 16), p += 4; } else { - write_insn(p, lis_0_0 + hi(indx)), p += 4; - write_insn(p, ori_0_0_0 + l(indx)), p += 4; + 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, ld_2_11 + l(-16)), p += 4; + write_insn(p, mtlr_0), p += 4; + write_insn(p, sub_12_12_11), p += 4; + write_insn(p, add_11_2_11), p += 4; + write_insn(p, addi_0_12 + l(-48)), p += 4; + write_insn(p, ld_12_11 + 0), p += 4; + write_insn(p, srdi_0_0_2), p += 4; + write_insn(p, mtctr_12), p += 4; + 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; + + // Write lazy link call stubs. + uint32_t indx = 0; + while (p < oview + this->end_branch_table_) + { + if (this->targ_->abiversion() < 2) + { + if (indx < 0x8000) + { + write_insn(p, li_0_0 + indx), p += 4; + } + else + { + write_insn(p, lis_0_0 + hi(indx)), p += 4; + write_insn(p, ori_0_0_0 + l(indx)), p += 4; + } + } + uint32_t branch_off = 8 - (p - oview); + write_insn(p, b + (branch_off & 0x3fffffc)), p += 4; + indx++; + } + } + + Address plt_base = this->targ_->plt_section()->address(); + Address iplt_base = invalid_address; + unsigned int global_entry_off = (this->end_branch_table_ + 15) & -16; + Address global_entry_base = this->address() + global_entry_off; + typename Global_entry_stub_entries::const_iterator ge; + for (ge = this->global_entry_stubs_.begin(); + ge != this->global_entry_stubs_.end(); + ++ge) + { + p = oview + global_entry_off + ge->second; + Address plt_addr = ge->first->plt_offset(); + if (ge->first->type() == elfcpp::STT_GNU_IFUNC + && ge->first->can_use_relative_reloc(false)) + { + if (iplt_base == invalid_address) + iplt_base = this->targ_->iplt_section()->address(); + plt_addr += iplt_base; } - uint32_t branch_off = 8 - (p - oview); - write_insn(p, b + (branch_off & 0x3fffffc)), p += 4; - indx++; + else + plt_addr += plt_base; + Address my_addr = global_entry_base + ge->second; + Address off = plt_addr - my_addr; + + if (off + 0x80008000 > 0xffffffff || (off & 3) != 0) + gold_error(_("%s: linkage table error against `%s'"), + ge->first->object()->name().c_str(), + ge->first->demangled_name().c_str()); + + write_insn(p, addis_12_12 + ha(off)), p += 4; + write_insn(p, ld_12_12 + l(off)), p += 4; + write_insn(p, mtctr_12), p += 4; + write_insn(p, bctr); } } else @@ -3874,6 +4998,7 @@ Target_powerpc::make_glink_section(Layout* layout) if (this->glink_ == NULL) { this->glink_ = new Output_data_glink(this); + this->glink_->add_eh_frame(layout); layout->add_output_section_data(".text", elfcpp::SHT_PROGBITS, elfcpp::SHF_ALLOC | elfcpp::SHF_EXECINSTR, this->glink_, ORDER_TEXT, false); @@ -3926,28 +5051,7 @@ Target_powerpc::plt_entry_count() const { if (this->plt_ == NULL) return 0; - unsigned int count = this->plt_->entry_count(); - if (this->iplt_ != NULL) - count += this->iplt_->entry_count(); - return count; -} - -// Return the offset of the first non-reserved PLT entry. - -template -unsigned int -Target_powerpc::first_plt_entry_offset() const -{ - return this->plt_->first_plt_entry_offset(); -} - -// Return the size of each PLT entry. - -template -unsigned int -Target_powerpc::plt_entry_size() const -{ - return Output_data_plt_powerpc::get_plt_entry_size(); + return this->plt_->entry_count(); } // Create a GOT entry for local dynamic __tls_get_addr calls. @@ -3977,8 +5081,12 @@ Target_powerpc::tlsld_got_offset( template int -Target_powerpc::Scan::get_reference_flags(unsigned int r_type) +Target_powerpc::Scan::get_reference_flags( + unsigned int r_type, + const Target_powerpc* target) { + int ref = 0; + switch (r_type) { case elfcpp::R_POWERPC_NONE: @@ -3986,7 +5094,7 @@ Target_powerpc::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_POWERPC_GNU_VTENTRY: case elfcpp::R_PPC64_TOC: // No symbol reference. - return 0; + break; case elfcpp::R_PPC64_ADDR64: case elfcpp::R_PPC64_UADDR64: @@ -3997,13 +5105,15 @@ Target_powerpc::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_POWERPC_ADDR16_LO: case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_ADDR16_HA: - return Symbol::ABSOLUTE_REF; + ref = Symbol::ABSOLUTE_REF; + break; case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_ADDR14: case elfcpp::R_POWERPC_ADDR14_BRTAKEN: case elfcpp::R_POWERPC_ADDR14_BRNTAKEN: - return Symbol::FUNCTION_CALL | Symbol::ABSOLUTE_REF; + ref = Symbol::FUNCTION_CALL | Symbol::ABSOLUTE_REF; + break; case elfcpp::R_PPC64_REL64: case elfcpp::R_POWERPC_REL32: @@ -4012,14 +5122,16 @@ Target_powerpc::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_POWERPC_REL16_LO: case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: - return Symbol::RELATIVE_REF; + ref = Symbol::RELATIVE_REF; + break; case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: - return Symbol::FUNCTION_CALL | Symbol::RELATIVE_REF; + ref = Symbol::FUNCTION_CALL | Symbol::RELATIVE_REF; + break; case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: @@ -4034,11 +5146,13 @@ Target_powerpc::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_PPC64_TOC16_DS: case elfcpp::R_PPC64_TOC16_LO_DS: // Absolute in GOT. - return Symbol::ABSOLUTE_REF; + ref = Symbol::ABSOLUTE_REF; + break; case elfcpp::R_POWERPC_GOT_TPREL16: case elfcpp::R_POWERPC_TLS: - return Symbol::TLS_REF; + ref = Symbol::TLS_REF; + break; case elfcpp::R_POWERPC_COPY: case elfcpp::R_POWERPC_GLOB_DAT: @@ -4047,8 +5161,12 @@ Target_powerpc::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_POWERPC_DTPMOD: default: // Not expected. We will give an error later. - return 0; + break; } + + if (size == 64 && target->abiversion() < 2) + ref |= Symbol::FUNC_DESC_ABI; + return ref; } // Report an unsupported relocation against a local symbol. @@ -4119,6 +5237,8 @@ Target_powerpc::Scan::check_non_pic(Relobj* object, case elfcpp::R_PPC64_JMP_IREL: case elfcpp::R_PPC64_ADDR16_DS: case elfcpp::R_PPC64_ADDR16_LO_DS: + case elfcpp::R_PPC64_ADDR16_HIGH: + case elfcpp::R_PPC64_ADDR16_HIGHA: case elfcpp::R_PPC64_ADDR16_HIGHER: case elfcpp::R_PPC64_ADDR16_HIGHEST: case elfcpp::R_PPC64_ADDR16_HIGHERA: @@ -4127,6 +5247,8 @@ Target_powerpc::Scan::check_non_pic(Relobj* object, case elfcpp::R_POWERPC_ADDR30: case elfcpp::R_PPC64_TPREL16_DS: case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: case elfcpp::R_PPC64_TPREL16_HIGHER: case elfcpp::R_PPC64_TPREL16_HIGHEST: case elfcpp::R_PPC64_TPREL16_HIGHERA: @@ -4172,39 +5294,42 @@ Target_powerpc::Scan::check_non_pic(Relobj* object, template bool Target_powerpc::Scan::reloc_needs_plt_for_ifunc( + Target_powerpc* target, Sized_relobj_file* object, - unsigned int r_type) + unsigned int r_type, + bool report_err) { // In non-pic code any reference will resolve to the plt call stub // for the ifunc symbol. - if (size == 32 && !parameters->options().output_is_position_independent()) + if ((size == 32 || target->abiversion() >= 2) + && !parameters->options().output_is_position_independent()) return true; switch (r_type) { - // Word size refs from data sections are OK. + // Word size refs from data sections are OK, but don't need a PLT entry. case elfcpp::R_POWERPC_ADDR32: case elfcpp::R_POWERPC_UADDR32: if (size == 32) - return true; + return false; break; case elfcpp::R_PPC64_ADDR64: case elfcpp::R_PPC64_UADDR64: if (size == 64) - return true; + return false; break; - // GOT refs are good. + // GOT refs are good, but also don't need a PLT entry. case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_GOT16_LO: case elfcpp::R_POWERPC_GOT16_HI: case elfcpp::R_POWERPC_GOT16_HA: case elfcpp::R_PPC64_GOT16_DS: case elfcpp::R_PPC64_GOT16_LO_DS: - return true; + return false; - // So are function calls. + // Function calls are good, and these do need a PLT entry. case elfcpp::R_POWERPC_ADDR24: case elfcpp::R_POWERPC_ADDR14: case elfcpp::R_POWERPC_ADDR14_BRTAKEN: @@ -4229,7 +5354,8 @@ Target_powerpc::Scan::reloc_needs_plt_for_ifunc( // writable and non-executable to apply text relocations. So we'll // segfault when trying to run the indirection function to resolve // the reloc. - gold_error(_("%s: unsupported reloc %u for IFUNC symbol"), + if (report_err) + gold_error(_("%s: unsupported reloc %u for IFUNC symbol"), object->name().c_str(), r_type); return false; } @@ -4250,6 +5376,25 @@ Target_powerpc::Scan::local( const elfcpp::Sym& lsym, bool is_discarded) { + this->maybe_skip_tls_get_addr_call(r_type, NULL); + + if ((size == 64 && r_type == elfcpp::R_PPC64_TLSGD) + || (size == 32 && r_type == elfcpp::R_PPC_TLSGD)) + { + this->expect_tls_get_addr_call(); + const tls::Tls_optimization tls_type = target->optimize_tls_gd(true); + if (tls_type != tls::TLSOPT_NONE) + this->skip_next_tls_get_addr_call(); + } + else if ((size == 64 && r_type == elfcpp::R_PPC64_TLSLD) + || (size == 32 && r_type == elfcpp::R_PPC_TLSLD)) + { + this->expect_tls_get_addr_call(); + const tls::Tls_optimization tls_type = target->optimize_tls_ld(); + if (tls_type != tls::TLSOPT_NONE) + this->skip_next_tls_get_addr_call(); + } + Powerpc_relobj* ppc_object = static_cast*>(object); @@ -4264,7 +5409,7 @@ Target_powerpc::Scan::local( // A local STT_GNU_IFUNC symbol may require a PLT entry. bool is_ifunc = lsym.get_st_type() == elfcpp::STT_GNU_IFUNC; - if (is_ifunc && this->reloc_needs_plt_for_ifunc(object, r_type)) + if (is_ifunc && this->reloc_needs_plt_for_ifunc(target, object, r_type, true)) { unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), @@ -4278,7 +5423,6 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: case elfcpp::R_PPC64_TOCSAVE: - case elfcpp::R_PPC_EMB_MRKREF: case elfcpp::R_POWERPC_TLS: break; @@ -4290,6 +5434,7 @@ Target_powerpc::Scan::local( { Address off = reloc.get_r_offset(); if (size == 64 + && target->abiversion() < 2 && data_shndx == ppc_object->opd_shndx() && ppc_object->get_opd_discard(off - 8)) break; @@ -4315,6 +5460,8 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_ADDR16_HA: case elfcpp::R_POWERPC_UADDR16: + case elfcpp::R_PPC64_ADDR16_HIGH: + case elfcpp::R_PPC64_ADDR16_HIGHA: case elfcpp::R_PPC64_ADDR16_HIGHER: case elfcpp::R_PPC64_ADDR16_HIGHERA: case elfcpp::R_PPC64_ADDR16_HIGHEST: @@ -4328,20 +5475,16 @@ Target_powerpc::Scan::local( // executable), we need to create a dynamic relocation for // this location. if (parameters->options().output_is_position_independent() - || (size == 64 && is_ifunc)) + || (size == 64 && is_ifunc && target->abiversion() < 2)) { - Reloc_section* rela_dyn = target->rela_dyn_section(layout); - + Reloc_section* rela_dyn = target->rela_dyn_section(symtab, layout, + is_ifunc); if ((size == 32 && r_type == elfcpp::R_POWERPC_ADDR32) || (size == 64 && r_type == elfcpp::R_PPC64_ADDR64)) { unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); - unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; - if (is_ifunc) - { - rela_dyn = target->iplt_section()->rel_plt(); - dynrel = elfcpp::R_POWERPC_IRELATIVE; - } + unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE + : elfcpp::R_POWERPC_RELATIVE); rela_dyn->add_local_relative(object, r_sym, dynrel, output_section, data_shndx, reloc.get_r_offset(), @@ -4361,17 +5504,13 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_PLTREL24: case elfcpp::R_PPC_LOCAL24PC: - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); - break; - case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + if (!is_ifunc) + target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), + r_type, elfcpp::elf_r_sym(reloc.get_r_info()), + reloc.get_r_addend()); break; case elfcpp::R_PPC64_REL64: @@ -4381,33 +5520,38 @@ Target_powerpc::Scan::local( case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: case elfcpp::R_POWERPC_SECTOFF: - case elfcpp::R_POWERPC_TPREL16: - case elfcpp::R_POWERPC_DTPREL16: case elfcpp::R_POWERPC_SECTOFF_LO: - case elfcpp::R_POWERPC_TPREL16_LO: - case elfcpp::R_POWERPC_DTPREL16_LO: case elfcpp::R_POWERPC_SECTOFF_HI: - case elfcpp::R_POWERPC_TPREL16_HI: - case elfcpp::R_POWERPC_DTPREL16_HI: case elfcpp::R_POWERPC_SECTOFF_HA: + case elfcpp::R_PPC64_SECTOFF_DS: + case elfcpp::R_PPC64_SECTOFF_LO_DS: + case elfcpp::R_POWERPC_TPREL16: + case elfcpp::R_POWERPC_TPREL16_LO: + case elfcpp::R_POWERPC_TPREL16_HI: case elfcpp::R_POWERPC_TPREL16_HA: - case elfcpp::R_POWERPC_DTPREL16_HA: - case elfcpp::R_PPC64_DTPREL16_HIGHER: + case elfcpp::R_PPC64_TPREL16_DS: + case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: case elfcpp::R_PPC64_TPREL16_HIGHER: - case elfcpp::R_PPC64_DTPREL16_HIGHERA: case elfcpp::R_PPC64_TPREL16_HIGHERA: - case elfcpp::R_PPC64_DTPREL16_HIGHEST: case elfcpp::R_PPC64_TPREL16_HIGHEST: - case elfcpp::R_PPC64_DTPREL16_HIGHESTA: case elfcpp::R_PPC64_TPREL16_HIGHESTA: - case elfcpp::R_PPC64_TPREL16_DS: - case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_POWERPC_DTPREL16: + case elfcpp::R_POWERPC_DTPREL16_LO: + case elfcpp::R_POWERPC_DTPREL16_HI: + case elfcpp::R_POWERPC_DTPREL16_HA: case elfcpp::R_PPC64_DTPREL16_DS: case elfcpp::R_PPC64_DTPREL16_LO_DS: - case elfcpp::R_PPC64_SECTOFF_DS: - case elfcpp::R_PPC64_SECTOFF_LO_DS: + case elfcpp::R_PPC64_DTPREL16_HIGH: + case elfcpp::R_PPC64_DTPREL16_HIGHA: + case elfcpp::R_PPC64_DTPREL16_HIGHER: + case elfcpp::R_PPC64_DTPREL16_HIGHERA: + case elfcpp::R_PPC64_DTPREL16_HIGHEST: + case elfcpp::R_PPC64_DTPREL16_HIGHESTA: case elfcpp::R_PPC64_TLSGD: case elfcpp::R_PPC64_TLSLD: + case elfcpp::R_PPC64_ADDR64_LOCAL: break; case elfcpp::R_POWERPC_GOT16: @@ -4424,7 +5568,8 @@ Target_powerpc::Scan::local( if (!parameters->options().output_is_position_independent()) { - if (size == 32 && is_ifunc) + if ((size == 32 && is_ifunc) + || (size == 64 && target->abiversion() >= 2)) got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD); else got->add_local(object, r_sym, GOT_TYPE_STANDARD); @@ -4437,13 +5582,10 @@ Target_powerpc::Scan::local( off = got->add_constant(0); object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off); - Reloc_section* rela_dyn = target->rela_dyn_section(layout); - unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; - if (is_ifunc) - { - rela_dyn = target->iplt_section()->rel_plt(); - dynrel = elfcpp::R_POWERPC_IRELATIVE; - } + Reloc_section* rela_dyn = target->rela_dyn_section(symtab, layout, + is_ifunc); + unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE + : elfcpp::R_POWERPC_RELATIVE); rela_dyn->add_local_relative(object, r_sym, dynrel, got, off, 0, false); } @@ -4554,6 +5696,21 @@ Target_powerpc::Scan::local( unsupported_reloc_local(object, r_type); break; } + + switch (r_type) + { + case elfcpp::R_POWERPC_GOT_TLSLD16: + case elfcpp::R_POWERPC_GOT_TLSGD16: + case elfcpp::R_POWERPC_GOT_TPREL16: + case elfcpp::R_POWERPC_GOT_DTPREL16: + case elfcpp::R_POWERPC_GOT16: + case elfcpp::R_PPC64_GOT16_DS: + case elfcpp::R_PPC64_TOC16: + case elfcpp::R_PPC64_TOC16_DS: + ppc_object->set_has_small_toc_reloc(); + default: + break; + } } // Report an unsupported relocation against a global symbol. @@ -4584,17 +5741,40 @@ Target_powerpc::Scan::global( unsigned int r_type, Symbol* gsym) { + if (this->maybe_skip_tls_get_addr_call(r_type, gsym) == Track_tls::SKIP) + return; + + if ((size == 64 && r_type == elfcpp::R_PPC64_TLSGD) + || (size == 32 && r_type == elfcpp::R_PPC_TLSGD)) + { + this->expect_tls_get_addr_call(); + const bool final = gsym->final_value_is_known(); + const tls::Tls_optimization tls_type = target->optimize_tls_gd(final); + if (tls_type != tls::TLSOPT_NONE) + this->skip_next_tls_get_addr_call(); + } + else if ((size == 64 && r_type == elfcpp::R_PPC64_TLSLD) + || (size == 32 && r_type == elfcpp::R_PPC_TLSLD)) + { + this->expect_tls_get_addr_call(); + const tls::Tls_optimization tls_type = target->optimize_tls_ld(); + if (tls_type != tls::TLSOPT_NONE) + this->skip_next_tls_get_addr_call(); + } + Powerpc_relobj* ppc_object = static_cast*>(object); // A STT_GNU_IFUNC symbol may require a PLT entry. - if (gsym->type() == elfcpp::STT_GNU_IFUNC - && this->reloc_needs_plt_for_ifunc(object, r_type)) + bool is_ifunc = gsym->type() == elfcpp::STT_GNU_IFUNC; + bool pushed_ifunc = false; + if (is_ifunc && this->reloc_needs_plt_for_ifunc(target, object, r_type, true)) { target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), r_type, elfcpp::elf_r_sym(reloc.get_r_info()), reloc.get_r_addend()); target->make_plt_entry(symtab, layout, gsym); + pushed_ifunc = true; } switch (r_type) @@ -4603,7 +5783,6 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: case elfcpp::R_PPC_LOCAL24PC: - case elfcpp::R_PPC_EMB_MRKREF: case elfcpp::R_POWERPC_TLS: break; @@ -4635,6 +5814,7 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC64_ADDR64: if (size == 64 + && target->abiversion() < 2 && data_shndx == ppc_object->opd_shndx() && (gsym->is_defined_in_discarded_section() || gsym->object() != object)) @@ -4652,6 +5832,8 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_ADDR16_HA: case elfcpp::R_POWERPC_UADDR16: + case elfcpp::R_PPC64_ADDR16_HIGH: + case elfcpp::R_PPC64_ADDR16_HIGHA: case elfcpp::R_PPC64_ADDR16_HIGHER: case elfcpp::R_PPC64_ADDR16_HIGHERA: case elfcpp::R_PPC64_ADDR16_HIGHEST: @@ -4665,53 +5847,63 @@ Target_powerpc::Scan::global( // Make a PLT entry if necessary. if (gsym->needs_plt_entry()) { - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, - elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); - target->make_plt_entry(symtab, layout, gsym); // Since this is not a PC-relative relocation, we may be // taking the address of a function. In that case we need to // set the entry in the dynamic symbol table to the address of // the PLT call stub. - if (size == 32 + bool need_ifunc_plt = false; + if ((size == 32 || target->abiversion() >= 2) && gsym->is_from_dynobj() && !parameters->options().output_is_position_independent()) - gsym->set_needs_dynsym_value(); + { + gsym->set_needs_dynsym_value(); + need_ifunc_plt = true; + } + if (!is_ifunc || (!pushed_ifunc && need_ifunc_plt)) + { + target->push_branch(ppc_object, data_shndx, + reloc.get_r_offset(), r_type, + elfcpp::elf_r_sym(reloc.get_r_info()), + reloc.get_r_addend()); + target->make_plt_entry(symtab, layout, gsym); + } } // Make a dynamic relocation if necessary. - if (needs_dynamic_reloc(gsym, Scan::get_reference_flags(r_type)) - || (size == 64 && gsym->type() == elfcpp::STT_GNU_IFUNC)) + if (gsym->needs_dynamic_reloc(Scan::get_reference_flags(r_type, target)) + || (size == 64 && is_ifunc && target->abiversion() < 2)) { - if (gsym->may_need_copy_reloc()) + if (!parameters->options().output_is_position_independent() + && gsym->may_need_copy_reloc()) { target->copy_reloc(symtab, layout, object, data_shndx, output_section, gsym, reloc); } - else if ((size == 32 - && r_type == elfcpp::R_POWERPC_ADDR32 + else if ((((size == 32 + && r_type == elfcpp::R_POWERPC_ADDR32) + || (size == 64 + && r_type == elfcpp::R_PPC64_ADDR64 + && target->abiversion() >= 2)) && gsym->can_use_relative_reloc(false) && !(gsym->visibility() == elfcpp::STV_PROTECTED && parameters->options().shared())) || (size == 64 && r_type == elfcpp::R_PPC64_ADDR64 + && target->abiversion() < 2 && (gsym->can_use_relative_reloc(false) || data_shndx == ppc_object->opd_shndx()))) { - Reloc_section* rela_dyn = target->rela_dyn_section(layout); - unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; - if (gsym->type() == elfcpp::STT_GNU_IFUNC) - { - rela_dyn = target->iplt_section()->rel_plt(); - dynrel = elfcpp::R_POWERPC_IRELATIVE; - } + Reloc_section* rela_dyn + = target->rela_dyn_section(symtab, layout, is_ifunc); + unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE + : elfcpp::R_POWERPC_RELATIVE); rela_dyn->add_symbolless_global_addend( gsym, dynrel, output_section, object, data_shndx, reloc.get_r_offset(), reloc.get_r_addend()); } else { - Reloc_section* rela_dyn = target->rela_dyn_section(layout); + Reloc_section* rela_dyn + = target->rela_dyn_section(symtab, layout, is_ifunc); check_non_pic(object, r_type); rela_dyn->add_global(gsym, r_type, output_section, object, data_shndx, @@ -4724,23 +5916,28 @@ Target_powerpc::Scan::global( case elfcpp::R_PPC_PLTREL24: case elfcpp::R_POWERPC_REL24: - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); - if (gsym->needs_plt_entry() - || (!gsym->final_value_is_known() - && (gsym->is_undefined() - || gsym->is_from_dynobj() - || gsym->is_preemptible()))) - target->make_plt_entry(symtab, layout, gsym); + if (!is_ifunc) + { + target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), + r_type, + elfcpp::elf_r_sym(reloc.get_r_info()), + reloc.get_r_addend()); + if (gsym->needs_plt_entry() + || (!gsym->final_value_is_known() + && (gsym->is_undefined() + || gsym->is_from_dynobj() + || gsym->is_preemptible()))) + target->make_plt_entry(symtab, layout, gsym); + } // Fall thru case elfcpp::R_PPC64_REL64: case elfcpp::R_POWERPC_REL32: // Make a dynamic relocation if necessary. - if (needs_dynamic_reloc(gsym, Scan::get_reference_flags(r_type))) + if (gsym->needs_dynamic_reloc(Scan::get_reference_flags(r_type, target))) { - if (gsym->may_need_copy_reloc()) + if (!parameters->options().output_is_position_independent() + && gsym->may_need_copy_reloc()) { target->copy_reloc(symtab, layout, object, data_shndx, output_section, gsym, @@ -4748,7 +5945,8 @@ Target_powerpc::Scan::global( } else { - Reloc_section* rela_dyn = target->rela_dyn_section(layout); + Reloc_section* rela_dyn + = target->rela_dyn_section(symtab, layout, is_ifunc); check_non_pic(object, r_type); rela_dyn->add_global(gsym, r_type, output_section, object, data_shndx, reloc.get_r_offset(), @@ -4760,43 +5958,49 @@ Target_powerpc::Scan::global( case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: - target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), - r_type, elfcpp::elf_r_sym(reloc.get_r_info()), - reloc.get_r_addend()); + if (!is_ifunc) + target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), + r_type, elfcpp::elf_r_sym(reloc.get_r_info()), + reloc.get_r_addend()); break; case elfcpp::R_POWERPC_REL16: case elfcpp::R_POWERPC_REL16_LO: case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_POWERPC_REL16_HA: - case elfcpp::R_POWERPC_SECTOFF: - case elfcpp::R_POWERPC_TPREL16: - case elfcpp::R_POWERPC_DTPREL16: + case elfcpp::R_POWERPC_SECTOFF: case elfcpp::R_POWERPC_SECTOFF_LO: - case elfcpp::R_POWERPC_TPREL16_LO: - case elfcpp::R_POWERPC_DTPREL16_LO: case elfcpp::R_POWERPC_SECTOFF_HI: - case elfcpp::R_POWERPC_TPREL16_HI: - case elfcpp::R_POWERPC_DTPREL16_HI: case elfcpp::R_POWERPC_SECTOFF_HA: + case elfcpp::R_PPC64_SECTOFF_DS: + case elfcpp::R_PPC64_SECTOFF_LO_DS: + case elfcpp::R_POWERPC_TPREL16: + case elfcpp::R_POWERPC_TPREL16_LO: + case elfcpp::R_POWERPC_TPREL16_HI: case elfcpp::R_POWERPC_TPREL16_HA: - case elfcpp::R_POWERPC_DTPREL16_HA: - case elfcpp::R_PPC64_DTPREL16_HIGHER: + case elfcpp::R_PPC64_TPREL16_DS: + case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: case elfcpp::R_PPC64_TPREL16_HIGHER: - case elfcpp::R_PPC64_DTPREL16_HIGHERA: case elfcpp::R_PPC64_TPREL16_HIGHERA: - case elfcpp::R_PPC64_DTPREL16_HIGHEST: case elfcpp::R_PPC64_TPREL16_HIGHEST: - case elfcpp::R_PPC64_DTPREL16_HIGHESTA: case elfcpp::R_PPC64_TPREL16_HIGHESTA: - case elfcpp::R_PPC64_TPREL16_DS: - case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_POWERPC_DTPREL16: + case elfcpp::R_POWERPC_DTPREL16_LO: + case elfcpp::R_POWERPC_DTPREL16_HI: + case elfcpp::R_POWERPC_DTPREL16_HA: case elfcpp::R_PPC64_DTPREL16_DS: case elfcpp::R_PPC64_DTPREL16_LO_DS: - case elfcpp::R_PPC64_SECTOFF_DS: - case elfcpp::R_PPC64_SECTOFF_LO_DS: + case elfcpp::R_PPC64_DTPREL16_HIGH: + case elfcpp::R_PPC64_DTPREL16_HIGHA: + case elfcpp::R_PPC64_DTPREL16_HIGHER: + case elfcpp::R_PPC64_DTPREL16_HIGHERA: + case elfcpp::R_PPC64_DTPREL16_HIGHEST: + case elfcpp::R_PPC64_DTPREL16_HIGHESTA: case elfcpp::R_PPC64_TLSGD: case elfcpp::R_PPC64_TLSLD: + case elfcpp::R_PPC64_ADDR64_LOCAL: break; case elfcpp::R_POWERPC_GOT16: @@ -4812,7 +6016,8 @@ Target_powerpc::Scan::global( got = target->got_section(symtab, layout); if (gsym->final_value_is_known()) { - if (size == 32 && gsym->type() == elfcpp::STT_GNU_IFUNC) + if ((size == 32 && is_ifunc) + || (size == 64 && target->abiversion() >= 2)) got->add_global_plt(gsym, GOT_TYPE_STANDARD); else got->add_global(gsym, GOT_TYPE_STANDARD); @@ -4824,18 +6029,17 @@ Target_powerpc::Scan::global( unsigned int off = got->add_constant(0); gsym->set_got_offset(GOT_TYPE_STANDARD, off); - Reloc_section* rela_dyn = target->rela_dyn_section(layout); + Reloc_section* rela_dyn + = target->rela_dyn_section(symtab, layout, is_ifunc); + if (gsym->can_use_relative_reloc(false) - && !(size == 32 + && !((size == 32 + || target->abiversion() >= 2) && gsym->visibility() == elfcpp::STV_PROTECTED && parameters->options().shared())) { - unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; - if (gsym->type() == elfcpp::STT_GNU_IFUNC) - { - rela_dyn = target->iplt_section()->rel_plt(); - dynrel = elfcpp::R_POWERPC_IRELATIVE; - } + unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE + : elfcpp::R_POWERPC_RELATIVE); rela_dyn->add_global_relative(gsym, dynrel, got, off, 0, false); } else @@ -4868,8 +6072,8 @@ Target_powerpc::Scan::global( { Output_data_got_powerpc* got = target->got_section(symtab, layout); - got->add_global_pair_with_rel(gsym, GOT_TYPE_TLSGD, - target->rela_dyn_section(layout), + Reloc_section* rela_dyn = target->rela_dyn_section(layout); + got->add_global_pair_with_rel(gsym, GOT_TYPE_TLSGD, rela_dyn, elfcpp::R_POWERPC_DTPMOD, elfcpp::R_POWERPC_DTPREL); } @@ -4990,6 +6194,21 @@ Target_powerpc::Scan::global( unsupported_reloc_global(object, r_type, gsym); break; } + + switch (r_type) + { + case elfcpp::R_POWERPC_GOT_TLSLD16: + case elfcpp::R_POWERPC_GOT_TLSGD16: + case elfcpp::R_POWERPC_GOT_TPREL16: + case elfcpp::R_POWERPC_GOT_DTPREL16: + case elfcpp::R_POWERPC_GOT16: + case elfcpp::R_PPC64_GOT16_DS: + case elfcpp::R_PPC64_TOC16: + case elfcpp::R_PPC64_TOC16_DS: + ppc_object->set_has_small_toc_reloc(); + default: + break; + } } // Process relocations for gc. @@ -5070,11 +6289,12 @@ Target_powerpc::do_gc_add_reference( unsigned int dst_shndx, Address dst_off) const { + if (size != 64 || dst_obj->is_dynamic()) + return; + Powerpc_relobj* ppc_object = static_cast*>(dst_obj); - if (size == 64 - && !ppc_object->is_dynamic() - && dst_shndx == ppc_object->opd_shndx()) + if (dst_shndx != 0 && dst_shndx == ppc_object->opd_shndx()) { if (ppc_object->opd_valid()) { @@ -5106,7 +6326,7 @@ Target_powerpc::do_gc_mark_symbol( = static_cast*>(sym->object()); bool is_ordinary; unsigned int shndx = sym->shndx(&is_ordinary); - if (is_ordinary && shndx == ppc_object->opd_shndx()) + if (is_ordinary && shndx != 0 && shndx == ppc_object->opd_shndx()) { Sized_symbol* gsym = symtab->get_sized_symbol(sym); Address dst_off = gsym->value(); @@ -5121,6 +6341,42 @@ Target_powerpc::do_gc_mark_symbol( } } +// For a symbol location in .opd, set LOC to the location of the +// function entry. + +template +void +Target_powerpc::do_function_location( + Symbol_location* loc) const +{ + if (size == 64 && loc->shndx != 0) + { + if (loc->object->is_dynamic()) + { + Powerpc_dynobj* ppc_object + = static_cast*>(loc->object); + if (loc->shndx == ppc_object->opd_shndx()) + { + Address dest_off; + Address off = loc->offset - ppc_object->opd_address(); + loc->shndx = ppc_object->get_opd_ent(off, &dest_off); + loc->offset = dest_off; + } + } + else + { + const Powerpc_relobj* ppc_object + = static_cast*>(loc->object); + if (loc->shndx == ppc_object->opd_shndx()) + { + Address dest_off; + loc->shndx = ppc_object->get_opd_ent(loc->offset, &dest_off); + loc->offset = dest_off; + } + } + } +} + // Scan relocations for a section. template @@ -5180,10 +6436,12 @@ class Global_symbol_visitor_opd || !sym->in_real_elf()) return; + if (sym->object()->is_dynamic()) + return; + Powerpc_relobj<64, big_endian>* symobj = static_cast*>(sym->object()); - if (symobj->is_dynamic() - || symobj->opd_shndx() == 0) + if (symobj->opd_shndx() == 0) return; bool is_ordinary; @@ -5210,6 +6468,31 @@ Target_powerpc::define_save_restore_funcs( } } +// Sort linker created .got section first (for the header), then input +// sections belonging to files using small model code. + +template +class Sort_toc_sections +{ + public: + bool + operator()(const Output_section::Input_section& is1, + const Output_section::Input_section& is2) const + { + if (!is1.is_input_section() && is2.is_input_section()) + return true; + bool small1 + = (is1.is_input_section() + && (static_cast*>(is1.relobj()) + ->has_small_toc_reloc())); + bool small2 + = (is2.is_input_section() + && (static_cast*>(is2.relobj()) + ->has_small_toc_reloc())); + return small1 && !small2; + } +}; + // Finalize the sections. template @@ -5263,6 +6546,15 @@ Target_powerpc::do_finalize_sections( // need to mess with the relaxation machinery checkpointing. this->got_section(symtab, layout); this->make_brlt_section(layout); + + if (parameters->options().toc_sort()) + { + Output_section* os = this->got_->output_section(); + if (os != NULL && os->input_sections().size() > 1) + std::stable_sort(os->input_sections().begin(), + os->input_sections().end(), + Sort_toc_sections()); + } } } @@ -5304,19 +6596,47 @@ Target_powerpc::do_finalize_sections( this->copy_relocs_.emit(this->rela_dyn_section(layout)); } +// Return TRUE iff INSN is one we expect on a _LO variety toc/got +// reloc. + +static bool +ok_lo_toc_insn(uint32_t insn) +{ + return ((insn & (0x3f << 26)) == 14u << 26 /* addi */ + || (insn & (0x3f << 26)) == 32u << 26 /* lwz */ + || (insn & (0x3f << 26)) == 34u << 26 /* lbz */ + || (insn & (0x3f << 26)) == 36u << 26 /* stw */ + || (insn & (0x3f << 26)) == 38u << 26 /* stb */ + || (insn & (0x3f << 26)) == 40u << 26 /* lhz */ + || (insn & (0x3f << 26)) == 42u << 26 /* lha */ + || (insn & (0x3f << 26)) == 44u << 26 /* sth */ + || (insn & (0x3f << 26)) == 46u << 26 /* lmw */ + || (insn & (0x3f << 26)) == 47u << 26 /* stmw */ + || (insn & (0x3f << 26)) == 48u << 26 /* lfs */ + || (insn & (0x3f << 26)) == 50u << 26 /* lfd */ + || (insn & (0x3f << 26)) == 52u << 26 /* stfs */ + || (insn & (0x3f << 26)) == 54u << 26 /* stfd */ + || ((insn & (0x3f << 26)) == 58u << 26 /* lwa,ld,lmd */ + && (insn & 3) != 1) + || ((insn & (0x3f << 26)) == 62u << 26 /* std, stmd */ + && ((insn & 3) == 0 || (insn & 3) == 3)) + || (insn & (0x3f << 26)) == 12u << 26 /* addic */); +} + // Return the value to use for a branch relocation. template -typename elfcpp::Elf_types::Elf_Addr +typename Target_powerpc::Address Target_powerpc::symval_for_branch( + const Symbol_table* symtab, Address value, const Sized_symbol* gsym, Powerpc_relobj* object, unsigned int *dest_shndx) { + if (size == 32 || this->abiversion() >= 2) + gold_unreachable(); *dest_shndx = 0; - if (size == 32) - return value; // If the symbol is defined in an opd section, ie. is a function // descriptor, use the function descriptor code entry address @@ -5330,12 +6650,20 @@ Target_powerpc::symval_for_branch( if (shndx == 0) return value; Address opd_addr = symobj->get_output_section_offset(shndx); - gold_assert(opd_addr != invalid_address); - opd_addr += symobj->output_section(shndx)->address(); + if (opd_addr == invalid_address) + return value; + opd_addr += symobj->output_section_address(shndx); if (value >= opd_addr && value < opd_addr + symobj->section_size(shndx)) { Address sec_off; *dest_shndx = symobj->get_opd_ent(value - opd_addr, &sec_off); + if (symtab->is_section_folded(symobj, *dest_shndx)) + { + Section_id folded + = symtab->icf()->get_folded_section(symobj, *dest_shndx); + symobj = static_cast*>(folded.first); + *dest_shndx = folded.second; + } Address sec_addr = symobj->get_output_section_offset(*dest_shndx); gold_assert(sec_addr != invalid_address); sec_addr += symobj->output_section(*dest_shndx)->address(); @@ -5361,54 +6689,69 @@ Target_powerpc::Relocate::relocate( Address address, section_size_type view_size) { - bool is_tls_call = ((r_type == elfcpp::R_POWERPC_REL24 - || r_type == elfcpp::R_PPC_PLTREL24) - && gsym != NULL - && strcmp(gsym->name(), "__tls_get_addr") == 0); - enum skip_tls last_tls = this->call_tls_get_addr_; - this->call_tls_get_addr_ = CALL_NOT_EXPECTED; - if (is_tls_call) + if (view == NULL) + return true; + + switch (this->maybe_skip_tls_get_addr_call(r_type, gsym)) { - if (last_tls == CALL_NOT_EXPECTED) - gold_error_at_location(relinfo, relnum, rela.get_r_offset(), - _("__tls_get_addr call lacks marker reloc")); - else if (last_tls == CALL_SKIP) - return false; + case Track_tls::NOT_EXPECTED: + gold_error_at_location(relinfo, relnum, rela.get_r_offset(), + _("__tls_get_addr call lacks marker reloc")); + break; + case Track_tls::EXPECTED: + // We have already complained. + break; + case Track_tls::SKIP: + return true; + case Track_tls::NORMAL: + break; } - else if (last_tls != CALL_NOT_EXPECTED) - gold_error_at_location(relinfo, relnum, rela.get_r_offset(), - _("missing expected __tls_get_addr call")); typedef Powerpc_relocate_functions Reloc; typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; Powerpc_relobj* const object = static_cast*>(relinfo->object); Address value = 0; - bool has_plt_value = false; + bool has_stub_value = false; unsigned int r_sym = elfcpp::elf_r_sym(rela.get_r_info()); - if (gsym != NULL - ? use_plt_offset(gsym, Scan::get_reference_flags(r_type)) - : object->local_has_plt_offset(r_sym)) + if ((gsym != NULL + ? gsym->use_plt_offset(Scan::get_reference_flags(r_type, target)) + : object->local_has_plt_offset(r_sym)) + && (!psymval->is_ifunc_symbol() + || Scan::reloc_needs_plt_for_ifunc(target, object, r_type, false))) { - Stub_table* stub_table - = object->stub_table(relinfo->data_shndx); - if (stub_table == NULL) + if (size == 64 + && gsym != NULL + && target->abiversion() >= 2 + && !parameters->options().output_is_position_independent() + && !is_branch_reloc(r_type)) { - // This is a ref from a data section to an ifunc symbol. - if (target->stub_tables().size() != 0) - stub_table = target->stub_tables()[0]; + unsigned int off = target->glink_section()->find_global_entry(gsym); + gold_assert(off != (unsigned int)-1); + value = target->glink_section()->global_entry_address() + off; } - gold_assert(stub_table != NULL); - Address off; - if (gsym != NULL) - off = stub_table->find_plt_call_entry(object, gsym, r_type, - rela.get_r_addend()); else - off = stub_table->find_plt_call_entry(object, r_sym, r_type, - rela.get_r_addend()); - gold_assert(off != invalid_address); - value = stub_table->stub_address() + off; - has_plt_value = true; + { + Stub_table* stub_table + = object->stub_table(relinfo->data_shndx); + if (stub_table == NULL) + { + // This is a ref from a data section to an ifunc symbol. + if (target->stub_tables().size() != 0) + stub_table = target->stub_tables()[0]; + } + gold_assert(stub_table != NULL); + Address off; + if (gsym != NULL) + off = stub_table->find_plt_call_entry(object, gsym, r_type, + rela.get_r_addend()); + else + off = stub_table->find_plt_call_entry(object, r_sym, r_type, + rela.get_r_addend()); + gold_assert(off != invalid_address); + value = stub_table->stub_address() + off; + } + has_stub_value = true; } if (r_type == elfcpp::R_POWERPC_GOT16 @@ -5439,7 +6782,7 @@ Target_powerpc::Relocate::relocate( else if (gsym != NULL && (r_type == elfcpp::R_POWERPC_REL24 || r_type == elfcpp::R_PPC_PLTREL24) - && has_plt_value) + && has_stub_value) { if (size == 64) { @@ -5454,7 +6797,8 @@ Target_powerpc::Relocate::relocate( && (insn2 == nop || insn2 == cror_15_15_15 || insn2 == cror_31_31_31)) { - elfcpp::Swap<32, big_endian>::writeval(wv + 1, ld_2_1 + 40); + elfcpp::Swap<32, big_endian>:: + writeval(wv + 1, ld_2_1 + target->stk_toc()); can_plt_call = true; } } @@ -5469,20 +6813,27 @@ Target_powerpc::Relocate::relocate( } if (!can_plt_call) { - // This is not an error in one special case: A self - // call. It isn't possible to cheaply verify we have - // such a call so just check for a call to the same - // section. + // g++ as of 20130507 emits self-calls without a + // following nop. This is arguably wrong since we have + // conflicting information. On the one hand a global + // symbol and on the other a local call sequence, but + // don't error for this special case. + // It isn't possible to cheaply verify we have exactly + // such a call. Allow all calls to the same section. bool ok = false; Address code = value; if (gsym->source() == Symbol::FROM_OBJECT && gsym->object() == object) { - Address addend = rela.get_r_addend(); - unsigned int dest_shndx; - Address opdent = psymval->value(object, addend); - code = target->symval_for_branch(opdent, gsym, object, - &dest_shndx); + unsigned int dest_shndx = 0; + if (target->abiversion() < 2) + { + Address addend = rela.get_r_addend(); + Address opdent = psymval->value(object, addend); + code = target->symval_for_branch(relinfo->symtab, + opdent, gsym, object, + &dest_shndx); + } bool is_ordinary; if (dest_shndx == 0) dest_shndx = gsym->shndx(&is_ordinary); @@ -5674,7 +7025,7 @@ Target_powerpc::Relocate::relocate( { // Second instruction of a global dynamic sequence, // the __tls_get_addr call - this->call_tls_get_addr_ = CALL_EXPECTED; + this->expect_tls_get_addr_call(relinfo, relnum, rela.get_r_offset()); const bool final = gsym == NULL || gsym->final_value_is_known(); const tls::Tls_optimization tls_type = target->optimize_tls_gd(final); if (tls_type != tls::TLSOPT_NONE) @@ -5697,7 +7048,7 @@ Target_powerpc::Relocate::relocate( view += 2 * big_endian; value = psymval->value(object, rela.get_r_addend()); } - this->call_tls_get_addr_ = CALL_SKIP; + this->skip_next_tls_get_addr_call(); } } else if ((size == 64 && r_type == elfcpp::R_PPC64_TLSLD) @@ -5705,14 +7056,14 @@ Target_powerpc::Relocate::relocate( { // Second instruction of a local dynamic sequence, // the __tls_get_addr call - this->call_tls_get_addr_ = CALL_EXPECTED; + this->expect_tls_get_addr_call(relinfo, relnum, rela.get_r_offset()); const tls::Tls_optimization tls_type = target->optimize_tls_ld(); if (tls_type == tls::TLSOPT_TO_LE) { Insn* iview = reinterpret_cast(view); Insn insn = addi_3_3; elfcpp::Swap<32, big_endian>::writeval(iview, insn); - this->call_tls_get_addr_ = CALL_SKIP; + this->skip_next_tls_get_addr_call(); r_type = elfcpp::R_POWERPC_TPREL16_LO; view += 2 * big_endian; value = dtp_offset; @@ -5736,7 +7087,7 @@ Target_powerpc::Relocate::relocate( value = psymval->value(object, rela.get_r_addend()); } } - else if (!has_plt_value) + else if (!has_stub_value) { Address addend = 0; unsigned int dest_shndx; @@ -5744,7 +7095,18 @@ Target_powerpc::Relocate::relocate( addend = rela.get_r_addend(); value = psymval->value(object, addend); if (size == 64 && is_branch_reloc(r_type)) - value = target->symval_for_branch(value, gsym, object, &dest_shndx); + { + if (target->abiversion() >= 2) + { + if (gsym != NULL) + value += object->ppc64_local_entry_offset(gsym); + else + value += object->ppc64_local_entry_offset(r_sym); + } + else + value = target->symval_for_branch(relinfo->symtab, value, + gsym, object, &dest_shndx); + } unsigned int max_branch_offset = 0; if (r_type == elfcpp::R_POWERPC_REL24 || r_type == elfcpp::R_PPC_PLTREL24 @@ -5759,10 +7121,16 @@ Target_powerpc::Relocate::relocate( { Stub_table* stub_table = object->stub_table(relinfo->data_shndx); - gold_assert(stub_table != NULL); - Address off = stub_table->find_long_branch_entry(object, value); - if (off != invalid_address) - value = stub_table->stub_address() + stub_table->plt_size() + off; + if (stub_table != NULL) + { + Address off = stub_table->find_long_branch_entry(object, value); + if (off != invalid_address) + { + value = (stub_table->stub_address() + stub_table->plt_size() + + off); + has_stub_value = true; + } + } } } @@ -5806,8 +7174,10 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_PPC64_TPREL16_DS: case elfcpp::R_PPC64_TPREL16_LO_DS: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGHA: if (size != 64) - // R_PPC_TLSGD and R_PPC_TLSLD + // R_PPC_TLSGD, R_PPC_TLSLD, R_PPC_EMB_RELST_LO, R_PPC_EMB_RELST_HI break; case elfcpp::R_POWERPC_TPREL16: case elfcpp::R_POWERPC_TPREL16_LO: @@ -5837,10 +7207,19 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_DTPREL16_HI: case elfcpp::R_POWERPC_DTPREL16_HA: case elfcpp::R_POWERPC_DTPREL: + case elfcpp::R_PPC64_DTPREL16_HIGH: + case elfcpp::R_PPC64_DTPREL16_HIGHA: // tls symbol values are relative to tls_segment()->vaddr() value -= dtp_offset; break; + case elfcpp::R_PPC64_ADDR64_LOCAL: + if (gsym != NULL) + value += object->ppc64_local_entry_offset(gsym); + else + value += object->ppc64_local_entry_offset(r_sym); + break; + default: break; } @@ -5884,7 +7263,77 @@ Target_powerpc::Relocate::relocate( break; } + if (size == 64) + { + // Multi-instruction sequences that access the TOC can be + // optimized, eg. addis ra,r2,0; addi rb,ra,x; + // to nop; addi rb,r2,x; + switch (r_type) + { + default: + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_HA: + case elfcpp::R_POWERPC_GOT_TLSGD16_HA: + case elfcpp::R_POWERPC_GOT_TPREL16_HA: + case elfcpp::R_POWERPC_GOT_DTPREL16_HA: + case elfcpp::R_POWERPC_GOT16_HA: + case elfcpp::R_PPC64_TOC16_HA: + if (parameters->options().toc_optimize()) + { + Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + if ((insn & ((0x3f << 26) | 0x1f << 16)) + != ((15u << 26) | (2 << 16)) /* addis rt,2,imm */) + gold_error_at_location(relinfo, relnum, rela.get_r_offset(), + _("toc optimization is not supported " + "for %#08x instruction"), insn); + else if (value + 0x8000 < 0x10000) + { + elfcpp::Swap<32, big_endian>::writeval(iview, nop); + return true; + } + } + break; + + case elfcpp::R_POWERPC_GOT_TLSLD16_LO: + case elfcpp::R_POWERPC_GOT_TLSGD16_LO: + case elfcpp::R_POWERPC_GOT_TPREL16_LO: + case elfcpp::R_POWERPC_GOT_DTPREL16_LO: + case elfcpp::R_POWERPC_GOT16_LO: + case elfcpp::R_PPC64_GOT16_LO_DS: + case elfcpp::R_PPC64_TOC16_LO: + case elfcpp::R_PPC64_TOC16_LO_DS: + if (parameters->options().toc_optimize()) + { + Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + if (!ok_lo_toc_insn(insn)) + gold_error_at_location(relinfo, relnum, rela.get_r_offset(), + _("toc optimization is not supported " + "for %#08x instruction"), insn); + else if (value + 0x8000 < 0x10000) + { + if ((insn & (0x3f << 26)) == 12u << 26 /* addic */) + { + // Transform addic to addi when we change reg. + insn &= ~((0x3f << 26) | (0x1f << 16)); + insn |= (14u << 26) | (2 << 16); + } + else + { + insn &= ~(0x1f << 16); + insn |= 2 << 16; + } + elfcpp::Swap<32, big_endian>::writeval(iview, insn); + } + } + break; + } + } + typename Reloc::Overflow_check overflow = Reloc::CHECK_NONE; + elfcpp::Shdr shdr(relinfo->data_shdr); switch (r_type) { case elfcpp::R_POWERPC_ADDR32: @@ -5898,25 +7347,70 @@ Target_powerpc::Relocate::relocate( overflow = Reloc::CHECK_SIGNED; break; - case elfcpp::R_POWERPC_ADDR24: - case elfcpp::R_POWERPC_ADDR16: case elfcpp::R_POWERPC_UADDR16: - case elfcpp::R_PPC64_ADDR16_DS: - case elfcpp::R_POWERPC_ADDR14: - case elfcpp::R_POWERPC_ADDR14_BRTAKEN: - case elfcpp::R_POWERPC_ADDR14_BRNTAKEN: overflow = Reloc::CHECK_BITFIELD; break; - case elfcpp::R_POWERPC_REL24: - case elfcpp::R_PPC_PLTREL24: - case elfcpp::R_PPC_LOCAL24PC: + case elfcpp::R_POWERPC_ADDR16: + // We really should have three separate relocations, + // one for 16-bit data, one for insns with 16-bit signed fields, + // and one for insns with 16-bit unsigned fields. + overflow = Reloc::CHECK_BITFIELD; + if ((shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0) + overflow = Reloc::CHECK_LOW_INSN; + break; + + case elfcpp::R_POWERPC_ADDR16_HI: + case elfcpp::R_POWERPC_ADDR16_HA: + case elfcpp::R_POWERPC_GOT16_HI: + case elfcpp::R_POWERPC_GOT16_HA: + case elfcpp::R_POWERPC_PLT16_HI: + case elfcpp::R_POWERPC_PLT16_HA: + case elfcpp::R_POWERPC_SECTOFF_HI: + case elfcpp::R_POWERPC_SECTOFF_HA: + case elfcpp::R_PPC64_TOC16_HI: + case elfcpp::R_PPC64_TOC16_HA: + case elfcpp::R_PPC64_PLTGOT16_HI: + case elfcpp::R_PPC64_PLTGOT16_HA: + case elfcpp::R_POWERPC_TPREL16_HI: + case elfcpp::R_POWERPC_TPREL16_HA: + case elfcpp::R_POWERPC_DTPREL16_HI: + case elfcpp::R_POWERPC_DTPREL16_HA: + case elfcpp::R_POWERPC_GOT_TLSGD16_HI: + case elfcpp::R_POWERPC_GOT_TLSGD16_HA: + case elfcpp::R_POWERPC_GOT_TLSLD16_HI: + case elfcpp::R_POWERPC_GOT_TLSLD16_HA: + case elfcpp::R_POWERPC_GOT_TPREL16_HI: + case elfcpp::R_POWERPC_GOT_TPREL16_HA: + case elfcpp::R_POWERPC_GOT_DTPREL16_HI: + case elfcpp::R_POWERPC_GOT_DTPREL16_HA: + case elfcpp::R_POWERPC_REL16_HI: + case elfcpp::R_POWERPC_REL16_HA: + if (size != 32) + overflow = Reloc::CHECK_HIGH_INSN; + break; + case elfcpp::R_POWERPC_REL16: case elfcpp::R_PPC64_TOC16: case elfcpp::R_POWERPC_GOT16: case elfcpp::R_POWERPC_SECTOFF: case elfcpp::R_POWERPC_TPREL16: case elfcpp::R_POWERPC_DTPREL16: + case elfcpp::R_POWERPC_GOT_TLSGD16: + case elfcpp::R_POWERPC_GOT_TLSLD16: + case elfcpp::R_POWERPC_GOT_TPREL16: + case elfcpp::R_POWERPC_GOT_DTPREL16: + overflow = Reloc::CHECK_LOW_INSN; + break; + + case elfcpp::R_POWERPC_ADDR24: + case elfcpp::R_POWERPC_ADDR14: + case elfcpp::R_POWERPC_ADDR14_BRTAKEN: + case elfcpp::R_POWERPC_ADDR14_BRNTAKEN: + case elfcpp::R_PPC64_ADDR16_DS: + case elfcpp::R_POWERPC_REL24: + case elfcpp::R_PPC_PLTREL24: + case elfcpp::R_PPC_LOCAL24PC: case elfcpp::R_PPC64_TPREL16_DS: case elfcpp::R_PPC64_DTPREL16_DS: case elfcpp::R_PPC64_TOC16_DS: @@ -5925,14 +7419,29 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_REL14: case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN: - case elfcpp::R_POWERPC_GOT_TLSGD16: - case elfcpp::R_POWERPC_GOT_TLSLD16: - case elfcpp::R_POWERPC_GOT_TPREL16: - case elfcpp::R_POWERPC_GOT_DTPREL16: overflow = Reloc::CHECK_SIGNED; break; } + if (overflow == Reloc::CHECK_LOW_INSN + || overflow == Reloc::CHECK_HIGH_INSN) + { + Insn* iview = reinterpret_cast(view - 2 * big_endian); + Insn insn = elfcpp::Swap<32, big_endian>::readval(iview); + + overflow = Reloc::CHECK_SIGNED; + if ((insn & (0x3f << 26)) == 10u << 26 /* cmpli */) + overflow = Reloc::CHECK_BITFIELD; + else if (overflow == Reloc::CHECK_LOW_INSN + ? ((insn & (0x3f << 26)) == 28u << 26 /* andi */ + || (insn & (0x3f << 26)) == 24u << 26 /* ori */ + || (insn & (0x3f << 26)) == 26u << 26 /* xori */) + : ((insn & (0x3f << 26)) == 29u << 26 /* andis */ + || (insn & (0x3f << 26)) == 25u << 26 /* oris */ + || (insn & (0x3f << 26)) == 27u << 26 /* xoris */)) + overflow = Reloc::CHECK_UNSIGNED; + } + typename Powerpc_relocate_functions::Status status = Powerpc_relocate_functions::STATUS_OK; switch (r_type) @@ -5941,12 +7450,12 @@ Target_powerpc::Relocate::relocate( case elfcpp::R_POWERPC_TLS: case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: - case elfcpp::R_PPC_EMB_MRKREF: break; case elfcpp::R_PPC64_ADDR64: case elfcpp::R_PPC64_REL64: case elfcpp::R_PPC64_TOC: + case elfcpp::R_PPC64_ADDR64_LOCAL: Reloc::addr64(view, value); break; @@ -6012,6 +7521,12 @@ Target_powerpc::Relocate::relocate( status = Reloc::addr16_u(view, value, overflow); break; + case elfcpp::R_PPC64_ADDR16_HIGH: + case elfcpp::R_PPC64_TPREL16_HIGH: + case elfcpp::R_PPC64_DTPREL16_HIGH: + if (size == 32) + // R_PPC_EMB_MRKREF, R_PPC_EMB_RELST_LO, R_PPC_EMB_RELST_HA + goto unsupp; case elfcpp::R_POWERPC_ADDR16_HI: case elfcpp::R_POWERPC_REL16_HI: case elfcpp::R_PPC64_TOC16_HI: @@ -6026,6 +7541,12 @@ Target_powerpc::Relocate::relocate( Reloc::addr16_hi(view, value); break; + case elfcpp::R_PPC64_ADDR16_HIGHA: + case elfcpp::R_PPC64_TPREL16_HIGHA: + case elfcpp::R_PPC64_DTPREL16_HIGHA: + if (size == 32) + // R_PPC_EMB_RELSEC16, R_PPC_EMB_RELST_HI, R_PPC_EMB_BIT_FLD + goto unsupp; case elfcpp::R_POWERPC_ADDR16_HA: case elfcpp::R_POWERPC_REL16_HA: case elfcpp::R_PPC64_TOC16_HA: @@ -6150,11 +7671,6 @@ Target_powerpc::Relocate::relocate( 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_RELSEC16: - case elfcpp::R_PPC_EMB_RELST_LO: - case elfcpp::R_PPC_EMB_RELST_HI: - case elfcpp::R_PPC_EMB_RELST_HA: - case elfcpp::R_PPC_EMB_BIT_FLD: case elfcpp::R_PPC_EMB_RELSDA: case elfcpp::R_PPC_TOC16: default: @@ -6164,9 +7680,17 @@ Target_powerpc::Relocate::relocate( r_type); break; } - if (status != Powerpc_relocate_functions::STATUS_OK) - gold_error_at_location(relinfo, relnum, rela.get_r_offset(), - _("relocation overflow")); + if (status != Powerpc_relocate_functions::STATUS_OK + && (has_stub_value + || !(gsym != NULL + && gsym->is_weak_undefined() + && is_branch_reloc(r_type)))) + { + gold_error_at_location(relinfo, relnum, rela.get_r_offset(), + _("relocation overflow")); + if (has_stub_value) + gold_info(_("try relinking with a smaller --stub-group-size")); + } return true; } @@ -6593,6 +8117,12 @@ Target_powerpc::do_dynsym_value(const Symbol* gsym) const return (*p)->stub_address() + off; } } + else if (this->abiversion() >= 2) + { + unsigned int off = this->glink_section()->find_global_entry(gsym); + if (off != (unsigned int)-1) + return this->glink_section()->global_entry_address() + off; + } gold_unreachable(); } @@ -6637,6 +8167,12 @@ Target_powerpc::do_plt_address_for_global( return (*p)->stub_address() + off; } } + else if (this->abiversion() >= 2) + { + unsigned int off = this->glink_section()->find_global_entry(gsym); + if (off != (unsigned int)-1) + return this->glink_section()->global_entry_address() + off; + } gold_unreachable(); } @@ -6710,7 +8246,8 @@ class Target_selector_powerpc : public Target_selector { public: Target_selector_powerpc() - : Target_selector(elfcpp::EM_NONE, size, big_endian, + : Target_selector(size == 64 ? elfcpp::EM_PPC64 : elfcpp::EM_PPC, + size, big_endian, (size == 64 ? (big_endian ? "elf64-powerpc" : "elf64-powerpcle") : (big_endian ? "elf32-powerpc" : "elf32-powerpcle")), @@ -6720,28 +8257,6 @@ public: { } virtual Target* - do_recognize(Input_file*, off_t, int machine, int, int) - { - switch (size) - { - case 64: - if (machine != elfcpp::EM_PPC64) - return NULL; - break; - - case 32: - if (machine != elfcpp::EM_PPC) - return NULL; - break; - - default: - return NULL; - } - - return this->instantiate_target(); - } - - virtual Target* do_instantiate_target() { return new Target_powerpc(); } }; @@ -6751,4 +8266,17 @@ Target_selector_powerpc<32, false> target_selector_ppc32le; Target_selector_powerpc<64, true> target_selector_ppc64; 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 +const typename Stub_table::Address + Stub_table::invalid_address; +template +const typename Target_powerpc::Address + Target_powerpc::invalid_address; + } // End anonymous namespace.