X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fsymtab.h;h=aa0cb68c1deb3c3e68699551a68e8fd043bf244d;hb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;hp=358dd32f7945a442e5dd61d1ae573be2bd833fce;hpb=6d03d481a0827abf92804f8ffaf9ab00593943be;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/symtab.h b/gold/symtab.h index 358dd32f79..aa0cb68c1d 100644 --- a/gold/symtab.h +++ b/gold/symtab.h @@ -1,6 +1,6 @@ // symtab.h -- the gold symbol table -*- C++ -*- -// Copyright 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2006-2015 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -23,19 +23,18 @@ // Symbol_table // The symbol table. +#ifndef GOLD_SYMTAB_H +#define GOLD_SYMTAB_H + #include #include #include -#include "gc.h" #include "elfcpp.h" #include "parameters.h" #include "stringpool.h" #include "object.h" -#ifndef GOLD_SYMTAB_H -#define GOLD_SYMTAB_H - namespace gold { @@ -43,12 +42,14 @@ class Mapfile; class Object; class Relobj; template -class Sized_relobj; +class Sized_relobj_file; template class Sized_pluginobj; class Dynobj; template class Sized_dynobj; +template +class Sized_incrobj; class Versions; class Version_script_info; class Input_objects; @@ -58,9 +59,10 @@ class Output_segment; class Output_file; class Output_symtab_xindex; class Garbage_collection; +class Icf; // The base class of an entry in the symbol table. The symbol table -// can have a lot of entries, so we don't want this class to big. +// can have a lot of entries, so we don't want this class too big. // Size dependent fields can be found in the template class // Sized_symbol. Targets may support their own derived classes. @@ -119,6 +121,10 @@ class Symbol version() const { return this->version_; } + void + clear_version() + { this->version_ = NULL; } + // Return whether this version is the default for this symbol name // (eg, "foo@@V2" is a default version; "foo@V1" is not). Only // meaningful for versioned symbols. @@ -134,6 +140,10 @@ class Symbol set_is_default() { this->is_def_ = true; } + // Return the symbol's name as name@version (or name@@version). + std::string + versioned_name() const; + // Return the symbol source. Source source() const @@ -205,16 +215,61 @@ class Symbol type() const { return this->type_; } + // Set the symbol type. + void + set_type(elfcpp::STT type) + { this->type_ = type; } + + // Return true for function symbol. + bool + is_func() const + { + return (this->type_ == elfcpp::STT_FUNC + || this->type_ == elfcpp::STT_GNU_IFUNC); + } + // Return the symbol visibility. elfcpp::STV visibility() const { return this->visibility_; } + // Set the visibility. + void + set_visibility(elfcpp::STV visibility) + { this->visibility_ = visibility; } + + // Override symbol visibility. + void + override_visibility(elfcpp::STV); + + // Set whether the symbol was originally a weak undef or a regular undef + // when resolved by a dynamic def or by a special symbol. + inline void + set_undef_binding(elfcpp::STB bind) + { + if (!this->undef_binding_set_ || this->undef_binding_weak_) + { + this->undef_binding_weak_ = bind == elfcpp::STB_WEAK; + this->undef_binding_set_ = true; + } + } + + // Return TRUE if a weak undef was resolved by a dynamic def or + // by a special symbol. + inline bool + is_undef_binding_weak() const + { return this->undef_binding_weak_; } + // Return the non-visibility part of the st_other field. unsigned char nonvis() const { return this->nonvis_; } + // Set the non-visibility part of the st_other field. + void + set_nonvis(unsigned int nonvis) + { this->nonvis_ = nonvis; } + // Return whether this symbol is a forwarder. This will never be // true of a symbol found in the hash table, but may be true of // symbol pointers attached to object files. @@ -244,7 +299,9 @@ class Symbol needs_dynsym_entry() const { return (this->needs_dynsym_entry_ - || (this->in_reg() && this->in_dyn())); + || (this->in_reg() + && this->in_dyn() + && this->is_externally_visible())); } // Mark this symbol as needing an entry in the dynamic symbol table. @@ -255,7 +312,7 @@ class Symbol // Return whether this symbol should be added to the dynamic symbol // table. bool - should_add_dynsym_entry() const; + should_add_dynsym_entry(Symbol_table*) const; // Return whether this symbol has been seen in a regular object. bool @@ -289,6 +346,18 @@ class Symbol set_in_real_elf() { this->in_real_elf_ = true; } + // Return whether this symbol was defined in a section that was + // discarded from the link. This is used to control some error + // reporting. + bool + is_defined_in_discarded_section() const + { return this->is_defined_in_discarded_section_; } + + // Mark this symbol as having been defined in a discarded section. + void + set_is_defined_in_discarded_section() + { this->is_defined_in_discarded_section_ = true; } + // Return the index of this symbol in the output file symbol table. // A value of -1U means that this symbol is not going into the // output file. This starts out as zero, and is set to a non-zero @@ -361,10 +430,15 @@ class Symbol set_got_offset(unsigned int got_type, unsigned int got_offset) { this->got_offsets_.set_offset(got_type, got_offset); } + // Return the GOT offset list. + const Got_offset_list* + got_offset_list() const + { return this->got_offsets_.get_list(); } + // Return whether this symbol has an entry in the PLT section. bool has_plt_offset() const - { return this->has_plt_offset_; } + { return this->plt_offset_ != -1U; } // Return the offset into the PLT section of this symbol. unsigned int @@ -378,7 +452,7 @@ class Symbol void set_plt_offset(unsigned int plt_offset) { - this->has_plt_offset_ = true; + gold_assert(plt_offset != -1U); this->plt_offset_ = plt_offset; } @@ -402,6 +476,11 @@ class Symbol bool final_value_is_known() const; + // Return true if SHNDX represents a common symbol. This depends on + // the target. + static bool + is_common_shndx(unsigned int shndx); + // Return whether this is a defined symbol (not undefined or // common). bool @@ -413,7 +492,7 @@ class Symbol unsigned int shndx = this->shndx(&is_ordinary); return (is_ordinary ? shndx != elfcpp::SHN_UNDEF - : shndx != elfcpp::SHN_COMMON); + : !Symbol::is_common_shndx(shndx)); } // Return true if this symbol is from a dynamic object. @@ -423,6 +502,13 @@ class Symbol return this->source_ == FROM_OBJECT && this->object()->is_dynamic(); } + // Return whether this is a placeholder symbol from a plugin object. + bool + is_placeholder() const + { + return this->source_ == FROM_OBJECT && this->object()->pluginobj() != NULL; + } + // Return whether this is an undefined symbol. bool is_undefined() const @@ -437,7 +523,20 @@ class Symbol // Return whether this is a weak undefined symbol. bool is_weak_undefined() const - { return this->is_undefined() && this->binding() == elfcpp::STB_WEAK; } + { + return (this->is_undefined() + && (this->binding() == elfcpp::STB_WEAK + || this->is_undef_binding_weak())); + } + + // Return whether this is a strong undefined symbol. + bool + is_strong_undefined() const + { + return (this->is_undefined() + && this->binding() != elfcpp::STB_WEAK + && !this->is_undef_binding_weak()); + } // Return whether this is an absolute symbol. bool @@ -454,19 +553,22 @@ class Symbol bool is_common() const { + if (this->source_ != FROM_OBJECT) + return false; + if (this->type_ == elfcpp::STT_COMMON) + return true; bool is_ordinary; - return (this->source_ == FROM_OBJECT - && ((this->shndx(&is_ordinary) == elfcpp::SHN_COMMON - && !is_ordinary) - || this->type_ == elfcpp::STT_COMMON)); + unsigned int shndx = this->shndx(&is_ordinary); + return !is_ordinary && Symbol::is_common_shndx(shndx); } // Return whether this symbol can be seen outside this object. bool is_externally_visible() const { - return (this->visibility_ == elfcpp::STV_DEFAULT - || this->visibility_ == elfcpp::STV_PROTECTED); + return ((this->visibility_ == elfcpp::STV_DEFAULT + || this->visibility_ == elfcpp::STV_PROTECTED) + && !this->is_forced_local_); } // Return true if this symbol can be preempted by a definition in @@ -498,8 +600,14 @@ class Symbol if (!parameters->options().shared()) return false; - // If the user used -Bsymbolic, then nothing is preemptible. - if (parameters->options().Bsymbolic()) + // If the symbol was named in a --dynamic-list script, it is preemptible. + if (parameters->options().in_dynamic_list(this->name())) + return true; + + // If the user used -Bsymbolic or provided a --dynamic-list script, + // then nothing (else) is preemptible. + if (parameters->options().Bsymbolic() + || parameters->options().have_dynamic_list()) return false; // If the user used -Bsymbolic-functions, then functions are not @@ -515,30 +623,55 @@ class Symbol } // Return true if this symbol is a function that needs a PLT entry. - // If the symbol is defined in a dynamic object or if it is subject - // to pre-emption, we need to make a PLT entry. If we're doing a - // static link, we don't create PLT entries. bool needs_plt_entry() const { - return (!parameters->doing_static_link() - && this->type() == elfcpp::STT_FUNC - && (this->is_from_dynobj() - || this->is_undefined() - || this->is_preemptible())); + // An undefined symbol from an executable does not need a PLT entry. + if (this->is_undefined() && !parameters->options().shared()) + return false; + + // An STT_GNU_IFUNC symbol always needs a PLT entry, even when + // doing a static link. + if (this->type() == elfcpp::STT_GNU_IFUNC) + return true; + + // We only need a PLT entry for a function. + if (!this->is_func()) + return false; + + // If we're doing a static link or a -pie link, we don't create + // PLT entries. + if (parameters->doing_static_link() + || parameters->options().pie()) + return false; + + // We need a PLT entry if the function is defined in a dynamic + // object, or is undefined when building a shared object, or if it + // is subject to pre-emption. + return (this->is_from_dynobj() + || this->is_undefined() + || this->is_preemptible()); } // When determining whether a reference to a symbol needs a dynamic // relocation, we need to know several things about the reference. - // These flags may be or'ed together. + // These flags may be or'ed together. 0 means that the symbol + // isn't referenced at all. enum Reference_flags { - // Reference to the symbol's absolute address. + // A reference to the symbol's absolute address. This includes + // references that cause an absolute address to be stored in the GOT. ABSOLUTE_REF = 1, - // A non-PIC reference. - NON_PIC_REF = 2, - // A function call. - FUNCTION_CALL = 4 + // A reference that calculates the offset of the symbol from some + // anchor point, such as the PC or GOT. + RELATIVE_REF = 2, + // A TLS-related reference. + TLS_REF = 4, + // A reference that can always be treated as a function call. + FUNCTION_CALL = 8, + // When set, says that dynamic relocations are needed even if a + // symbol has a plt entry. + FUNC_DESC_ABI = 16, }; // Given a direct absolute or pc-relative static relocation against @@ -552,10 +685,10 @@ class Symbol if (parameters->doing_static_link()) return false; - // A reference to a weak undefined symbol from an executable should be + // 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 (this->is_weak_undefined() && !parameters->options().shared()) + if (this->is_undefined() && !parameters->options().shared()) return false; // A reference to an absolute symbol does not need a dynamic relocation. @@ -569,16 +702,14 @@ class Symbol return true; // A function call that can branch to a local PLT entry does not need - // a dynamic relocation. A non-pic pc-relative function call in a - // shared library cannot use a PLT entry. - if ((flags & FUNCTION_CALL) - && this->has_plt_offset() - && !((flags & NON_PIC_REF) && parameters->options().shared())) + // a dynamic relocation. + if ((flags & FUNCTION_CALL) && this->has_plt_offset()) return false; // A reference to any PLT entry in a non-position-independent executable // does not need a dynamic relocation. - if (!parameters->options().output_is_position_independent() + if (!(flags & FUNC_DESC_ABI) + && !parameters->options().output_is_position_independent() && this->has_plt_offset()) return false; @@ -594,24 +725,23 @@ class Symbol } // Whether we should use the PLT offset associated with a symbol for - // a relocation. IS_NON_PIC_REFERENCE is true if this is a non-PIC - // reloc--the same set of relocs for which we would pass NON_PIC_REF - // to the needs_dynamic_reloc function. + // a relocation. FLAGS is a set of Reference_flags. bool - use_plt_offset(bool is_non_pic_reference) const + use_plt_offset(int flags) const { // If the symbol doesn't have a PLT offset, then naturally we // don't want to use it. if (!this->has_plt_offset()) return false; + // For a STT_GNU_IFUNC symbol we always have to use the PLT entry. + if (this->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 (this->needs_dynamic_reloc(FUNCTION_CALL - | (is_non_pic_reference - ? NON_PIC_REF - : 0))) + if (this->needs_dynamic_reloc(flags)) return false; // If the symbol is from a dynamic object, we need to use the PLT @@ -625,10 +755,10 @@ class Symbol && (this->is_undefined() || this->is_preemptible())) return true; - // If this is a weak undefined symbol, we need to use the PLT - // entry; the symbol may be defined by a library loaded at - // runtime. - if (this->is_weak_undefined()) + // If this 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 & FUNCTION_CALL) && this->is_weak_undefined()) return true; // Otherwise we can use the regular definition. @@ -650,7 +780,7 @@ class Symbol return true; // A reference to a symbol defined in a dynamic object or to a - // symbol that is preemptible can not use a RELATIVE relocaiton. + // symbol that is preemptible can not use a RELATIVE relocation. if (this->is_from_dynobj() || this->is_undefined() || this->is_preemptible()) @@ -671,6 +801,18 @@ class Symbol void set_output_section(Output_section*); + // Set the symbol's output segment. This is used for pre-defined + // symbols whose segments aren't known until after layout is done + // (e.g., __ehdr_start). + void + set_output_segment(Output_segment*, Segment_offset_base); + + // Set the symbol to undefined. This is used for pre-defined + // symbols whose segments aren't known until after layout is done + // (e.g., __ehdr_start). + void + set_undefined(); + // Return whether there should be a warning for references to this // symbol. bool @@ -704,6 +846,27 @@ class Symbol set_is_forced_local() { this->is_forced_local_ = true; } + // Return true if this may need a COPY relocation. + // References from an executable object to non-function symbols + // defined in a dynamic object may need a COPY relocation. + bool + may_need_copy_reloc() const + { + return (parameters->options().copyreloc() + && this->is_from_dynobj() + && !this->is_func()); + } + + // Return true if this symbol was predefined by the linker. + bool + is_predefined() const + { return this->is_predefined_; } + + // Return true if this is a C++ vtable symbol. + bool + is_cxx_vtable() const + { return is_prefix_of("_ZTV", this->name_); } + protected: // Instances of this class should always be created at a specific // size. @@ -721,7 +884,7 @@ class Symbol // index rather than a special code. template void - init_base_object(const char *name, const char* version, Object* object, + init_base_object(const char* name, const char* version, Object* object, const elfcpp::Sym&, unsigned int st_shndx, bool is_ordinary); @@ -729,7 +892,8 @@ class Symbol void init_base_output_data(const char* name, const char* version, Output_data*, elfcpp::STT, elfcpp::STB, elfcpp::STV, - unsigned char nonvis, bool offset_is_from_end); + unsigned char nonvis, bool offset_is_from_end, + bool is_predefined); // Initialize fields for an Output_segment. void @@ -737,13 +901,14 @@ class Symbol Output_segment* os, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - Segment_offset_base offset_base); + Segment_offset_base offset_base, + bool is_predefined); // Initialize fields for a constant. void init_base_constant(const char* name, const char* version, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, - unsigned char nonvis); + unsigned char nonvis, bool is_predefined); // Initialize fields for an undefined symbol. void @@ -827,16 +992,14 @@ class Symbol // non-zero value during Layout::finalize. unsigned int dynsym_index_; - // If this symbol has an entry in the GOT section (has_got_offset_ - // is true), this holds the offset from the start of the GOT section. - // A symbol may have more than one GOT offset (e.g., when mixing - // modules compiled with two different TLS models), but will usually - // have at most one. + // The GOT section entries for this symbol. A symbol may have more + // than one GOT offset (e.g., when mixing modules compiled with two + // different TLS models), but will usually have at most one. Got_offset_list got_offsets_; - // If this symbol has an entry in the PLT section (has_plt_offset_ - // is true), then this is the offset from the start of the PLT - // section. + // If this symbol has an entry in the PLT section, then this is the + // offset from the start of the PLT section. This is -1U if there + // is no PLT entry. unsigned int plt_offset_; // Symbol type (bits 0 to 3). @@ -849,10 +1012,7 @@ class Symbol unsigned int nonvis_ : 6; // The type of symbol (bits 16 to 18). Source source_ : 3; - // True if this symbol always requires special target-specific - // handling (bit 19). - bool is_target_special_ : 1; - // True if this is the default version of the symbol (bit 20). + // True if this is the default version of the symbol (bit 19). bool is_def_ : 1; // True if this symbol really forwards to another symbol. This is // used when we discover after the fact that two different entries @@ -860,37 +1020,50 @@ class Symbol // never be set for a symbol found in the hash table, but may be set // for a symbol found in the list of symbols attached to an Object. // It forwards to the symbol found in the forwarders_ map of - // Symbol_table (bit 21). + // Symbol_table (bit 20). bool is_forwarder_ : 1; // True if the symbol has an alias in the weak_aliases table in - // Symbol_table (bit 22). + // Symbol_table (bit 21). bool has_alias_ : 1; // True if this symbol needs to be in the dynamic symbol table (bit - // 23). + // 22). bool needs_dynsym_entry_ : 1; - // True if we've seen this symbol in a regular object (bit 24). + // True if we've seen this symbol in a regular object (bit 23). bool in_reg_ : 1; - // True if we've seen this symbol in a dynamic object (bit 25). + // True if we've seen this symbol in a dynamic object (bit 24). bool in_dyn_ : 1; - // True if the symbol has an entry in the PLT section (bit 26). - bool has_plt_offset_ : 1; // True if this is a dynamic symbol which needs a special value in - // the dynamic symbol table (bit 27). + // the dynamic symbol table (bit 25). bool needs_dynsym_value_ : 1; - // True if there is a warning for this symbol (bit 28). + // True if there is a warning for this symbol (bit 26). bool has_warning_ : 1; // True if we are using a COPY reloc for this symbol, so that the - // real definition lives in a dynamic object (bit 29). + // real definition lives in a dynamic object (bit 27). bool is_copied_from_dynobj_ : 1; // True if this symbol was forced to local visibility by a version - // script (bit 30). + // script (bit 28). bool is_forced_local_ : 1; // True if the field u_.from_object.shndx is an ordinary section // index, not one of the special codes from SHN_LORESERVE to - // SHN_HIRESERVE (bit 31). + // SHN_HIRESERVE (bit 29). bool is_ordinary_shndx_ : 1; - // True if we've seen this symbol in a real ELF object. + // True if we've seen this symbol in a "real" ELF object (bit 30). + // If the symbol has been seen in a relocatable, non-IR, object file, + // it's known to be referenced from outside the IR. A reference from + // a dynamic object doesn't count as a "real" ELF, and we'll simply + // mark the symbol as "visible" from outside the IR. The compiler + // can use this distinction to guide its handling of COMDAT symbols. bool in_real_elf_ : 1; + // True if this symbol is defined in a section which was discarded + // (bit 31). + bool is_defined_in_discarded_section_ : 1; + // True if UNDEF_BINDING_WEAK_ has been set (bit 32). + bool undef_binding_set_ : 1; + // True if this symbol was a weak undef resolved by a dynamic def + // or by a special symbol (bit 33). + bool undef_binding_weak_ : 1; + // True if this symbol is a predefined linker symbol (bit 34). + bool is_predefined_ : 1; }; // The parts of a symbol which are size specific. Using a template @@ -911,7 +1084,7 @@ class Sized_symbol : public Symbol // index rather than a special code. template void - init_object(const char *name, const char* version, Object* object, + init_object(const char* name, const char* version, Object* object, const elfcpp::Sym&, unsigned int st_shndx, bool is_ordinary); @@ -920,20 +1093,20 @@ class Sized_symbol : public Symbol init_output_data(const char* name, const char* version, Output_data*, Value_type value, Size_type symsize, elfcpp::STT, elfcpp::STB, elfcpp::STV, unsigned char nonvis, - bool offset_is_from_end); + bool offset_is_from_end, bool is_predefined); // Initialize fields for an Output_segment. void init_output_segment(const char* name, const char* version, Output_segment*, Value_type value, Size_type symsize, elfcpp::STT, elfcpp::STB, elfcpp::STV, unsigned char nonvis, - Segment_offset_base offset_base); + Segment_offset_base offset_base, bool is_predefined); // Initialize fields for a constant. void init_constant(const char* name, const char* version, Value_type value, Size_type symsize, elfcpp::STT, elfcpp::STB, elfcpp::STV, - unsigned char nonvis); + unsigned char nonvis, bool is_predefined); // Initialize fields for an undefined symbol. void @@ -1061,6 +1234,25 @@ struct Define_symbol_in_segment bool only_if_ref; }; +// Specify an object/section/offset location. Used by ODR code. + +struct Symbol_location +{ + // Object where the symbol is defined. + Object* object; + // Section-in-object where the symbol is defined. + unsigned int shndx; + // For relocatable objects, offset-in-section where the symbol is defined. + // For dynamic objects, address where the symbol is defined. + off_t offset; + bool operator==(const Symbol_location& that) const + { + return (this->object == that.object + && this->shndx == that.shndx + && this->offset == that.offset); + } +}; + // This class manages warnings. Warnings are a GNU extension. When // we see a section named .gnu.warning.SYM in an object file, and if // we wind using the definition of SYM from that object file, then we @@ -1135,29 +1327,68 @@ class Warnings class Symbol_table { public: - // COUNT is an estimate of how many symbosl will be inserted in the + // The different places where a symbol definition can come from. + enum Defined + { + // Defined in an object file--the normal case. + OBJECT, + // Defined for a COPY reloc. + COPY, + // Defined on the command line using --defsym. + DEFSYM, + // Defined (so to speak) on the command line using -u. + UNDEFINED, + // Defined in a linker script. + SCRIPT, + // Predefined by the linker. + PREDEFINED, + // Defined by the linker during an incremental base link, but not + // a predefined symbol (e.g., common, defined in script). + INCREMENTAL_BASE, + }; + + // The order in which we sort common symbols. + enum Sort_commons_order + { + SORT_COMMONS_BY_SIZE_DESCENDING, + SORT_COMMONS_BY_ALIGNMENT_DESCENDING, + SORT_COMMONS_BY_ALIGNMENT_ASCENDING + }; + + // COUNT is an estimate of how many symbols will be inserted in the // symbol table. It's ok to put 0 if you don't know; a correct // guess will just save some CPU by reducing hashtable resizes. Symbol_table(unsigned int count, const Version_script_info& version_script); ~Symbol_table(); + void + set_icf(Icf* icf) + { this->icf_ = icf;} + + Icf* + icf() const + { return this->icf_; } + + // Returns true if ICF determined that this is a duplicate section. + bool + is_section_folded(Object* obj, unsigned int shndx) const; + void set_gc(Garbage_collection* gc) { this->gc_ = gc; } Garbage_collection* - gc() + gc() const { return this->gc_; } // During garbage collection, this keeps undefined symbols. void - gc_mark_undef_symbols(); + gc_mark_undef_symbols(Layout*); - // During garbage collection, this ensures externally visible symbols - // are not treated as garbage while building shared objects. + // This tells garbage collection that this symbol is referenced. void - gc_mark_symbol_for_shlib(Symbol* sym); + gc_mark_symbol(Symbol* sym); // During garbage collection, this keeps sections that correspond to // symbols seen in dynamic objects. @@ -1172,11 +1403,11 @@ class Symbol_table // *DEFINED to the number of defined symbols. template void - add_from_relobj(Sized_relobj* relobj, + add_from_relobj(Sized_relobj_file* relobj, const unsigned char* syms, size_t count, size_t symndx_offset, const char* sym_names, size_t sym_name_size, - typename Sized_relobj::Symbols*, + typename Sized_relobj_file::Symbols*, size_t* defined); // Add one external symbol from the plugin object OBJ to the symbol table. @@ -1198,13 +1429,20 @@ class Symbol_table const char* sym_names, size_t sym_name_size, const unsigned char* versym, size_t versym_size, const std::vector*, - typename Sized_relobj::Symbols*, + typename Sized_relobj_file::Symbols*, size_t* defined); + // Add one external symbol from the incremental object OBJ to the symbol + // table. Returns a pointer to the resolved symbol in the symbol table. + template + Sized_symbol* + add_from_incrobj(Object* obj, const char* name, + const char* ver, elfcpp::Sym* sym); + // Define a special symbol based on an Output_data. It is a // multiple definition error if this symbol is already defined. Symbol* - define_in_output_data(const char* name, const char* version, + define_in_output_data(const char* name, const char* version, Defined, Output_data*, uint64_t value, uint64_t symsize, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, @@ -1213,7 +1451,7 @@ class Symbol_table // Define a special symbol based on an Output_segment. It is a // multiple definition error if this symbol is already defined. Symbol* - define_in_output_segment(const char* name, const char* version, + define_in_output_segment(const char* name, const char* version, Defined, Output_segment*, uint64_t value, uint64_t symsize, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, @@ -1222,7 +1460,7 @@ class Symbol_table // Define a special symbol with a constant value. It is a multiple // definition error if this symbol is already defined. Symbol* - define_as_constant(const char* name, const char* version, + define_as_constant(const char* name, const char* version, Defined, uint64_t value, uint64_t symsize, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, bool only_if_ref, @@ -1266,7 +1504,7 @@ class Symbol_table get_sized_symbol(const Symbol*) const; // Return the count of undefined symbols seen. - int + size_t saw_undefined() const { return this->saw_undefined_; } @@ -1302,7 +1540,7 @@ class Symbol_table // Add any undefined symbols named on the command line to the symbol // table. void - add_undefined_symbols_from_command_line(); + add_undefined_symbols_from_command_line(Layout*); // SYM is defined using a COPY reloc. Return the dynamic object // where the original definition was found. @@ -1329,11 +1567,46 @@ class Symbol_table // local symbols. off_t finalize(off_t off, off_t dynoff, size_t dyn_global_index, size_t dyncount, - Stringpool* pool, unsigned int *plocal_symcount); + Stringpool* pool, unsigned int* plocal_symcount); + + // Set the final file offset of the symbol table. + void + set_file_offset(off_t off) + { this->offset_ = off; } + + // Status code of Symbol_table::compute_final_value. + enum Compute_final_value_status + { + // No error. + CFVS_OK, + // Unsupported symbol section. + CFVS_UNSUPPORTED_SYMBOL_SECTION, + // No output section. + CFVS_NO_OUTPUT_SECTION + }; + + // Compute the final value of SYM and store status in location PSTATUS. + // During relaxation, this may be called multiple times for a symbol to + // compute its would-be final value in each relaxation pass. + + template + typename Sized_symbol::Value_type + compute_final_value(const Sized_symbol* sym, + Compute_final_value_status* pstatus) const; + + // Return the index of the first global symbol. + unsigned int + first_global_index() const + { return this->first_global_index_; } + + // Return the total number of symbols in the symbol table. + unsigned int + output_count() const + { return this->output_count_; } // Write out the global symbols. void - write_globals(const Input_objects*, const Stringpool*, const Stringpool*, + write_globals(const Stringpool*, const Stringpool*, Output_symtab_xindex*, Output_symtab_xindex*, Output_file*) const; @@ -1342,6 +1615,20 @@ class Symbol_table write_section_symbol(const Output_section*, Output_symtab_xindex*, Output_file*, off_t) const; + // Loop over all symbols, applying the function F to each. + template + void + for_all_symbols(F f) const + { + for (Symbol_table_type::const_iterator p = this->table_.begin(); + p != this->table_.end(); + ++p) + { + Sized_symbol* sym = static_cast*>(p->second); + f(sym); + } + } + // Dump statistical information to stderr. void print_stats() const; @@ -1358,6 +1645,43 @@ class Symbol_table // The type of the list of common symbols. typedef std::vector Commons_type; + // The type of the symbol hash table. + + typedef std::pair Symbol_table_key; + + // The hash function. The key values are Stringpool keys. + struct Symbol_table_hash + { + inline size_t + operator()(const Symbol_table_key& key) const + { + return key.first ^ key.second; + } + }; + + struct Symbol_table_eq + { + bool + operator()(const Symbol_table_key&, const Symbol_table_key&) const; + }; + + typedef Unordered_map Symbol_table_type; + + // A map from symbol name (as a pointer into the namepool) to all + // the locations the symbols is (weakly) defined (and certain other + // conditions are met). This map will be used later to detect + // possible One Definition Rule (ODR) violations. + struct Symbol_location_hash + { + size_t operator()(const Symbol_location& loc) const + { return reinterpret_cast(loc.object) ^ loc.offset ^ loc.shndx; } + }; + + typedef Unordered_map > + Odr_map; + // Make FROM a forwarder symbol to TO. void make_forwarder(Symbol* from, Symbol* to); @@ -1365,12 +1689,18 @@ class Symbol_table // Add a symbol. template Sized_symbol* - add_from_object(Object*, const char *name, Stringpool::Key name_key, - const char *version, Stringpool::Key version_key, + add_from_object(Object*, const char* name, Stringpool::Key name_key, + const char* version, Stringpool::Key version_key, bool def, const elfcpp::Sym& sym, unsigned int st_shndx, bool is_ordinary, unsigned int orig_st_shndx); + // Define a default symbol. + template + void + define_default_version(Sized_symbol*, bool, + Symbol_table_type::iterator); + // Resolve symbols. template void @@ -1384,18 +1714,25 @@ class Symbol_table void resolve(Sized_symbol* to, const Sized_symbol* from); - // Record that a symbol is forced to be local by a version script. + // Record that a symbol is forced to be local by a version script or + // by visibility. void force_local(Symbol*); // Adjust NAME and *NAME_KEY for wrapping. const char* - wrap_symbol(Object* object, const char*, Stringpool::Key* name_key); + wrap_symbol(const char* name, Stringpool::Key* name_key); // Whether we should override a symbol, based on flags in // resolve.cc. static bool - should_override(const Symbol*, unsigned int, Object*, bool*); + should_override(const Symbol*, unsigned int, elfcpp::STT, Defined, + Object*, bool*, bool*); + + // Report a problem in symbol resolution. + static void + report_resolve_problem(bool is_error, const char* msg, const Symbol* to, + Defined, Object* object); // Override a symbol. template @@ -1408,7 +1745,7 @@ class Symbol_table // Whether we should override a symbol with a special symbol which // is automatically defined by the linker. static bool - should_override_with_special(const Symbol*); + should_override_with_special(const Symbol*, elfcpp::STT, Defined); // Override a symbol with a special symbol. template @@ -1425,12 +1762,14 @@ class Symbol_table template Sized_symbol* define_special_symbol(const char** pname, const char** pversion, - bool only_if_ref, Sized_symbol** poldsym); + bool only_if_ref, Sized_symbol** poldsym, + bool* resolve_oldsym); // Define a symbol in an Output_data, sized version. template Sized_symbol* - do_define_in_output_data(const char* name, const char* version, Output_data*, + do_define_in_output_data(const char* name, const char* version, Defined, + Output_data*, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword ssize, elfcpp::STT type, elfcpp::STB binding, @@ -1441,7 +1780,7 @@ class Symbol_table template Sized_symbol* do_define_in_output_segment( - const char* name, const char* version, Output_segment* os, + const char* name, const char* version, Defined, Output_segment* os, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword ssize, elfcpp::STT type, elfcpp::STB binding, @@ -1452,7 +1791,7 @@ class Symbol_table template Sized_symbol* do_define_as_constant( - const char* name, const char* version, + const char* name, const char* version, Defined, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword ssize, elfcpp::STT type, elfcpp::STB binding, @@ -1463,17 +1802,39 @@ class Symbol_table // table, sized version. template void - do_add_undefined_symbols_from_command_line(); + do_add_undefined_symbols_from_command_line(Layout*); + + // Add one undefined symbol. + template + void + add_undefined_symbol_from_command_line(const char* name); + + // Types of common symbols. + + enum Commons_section_type + { + COMMONS_NORMAL, + COMMONS_TLS, + COMMONS_SMALL, + COMMONS_LARGE + }; // Allocate the common symbols, sized version. template void - do_allocate_commons(Layout*, Mapfile*); + do_allocate_commons(Layout*, Mapfile*, Sort_commons_order); // Allocate the common symbols from one list. template void - do_allocate_commons_list(Layout*, bool is_tls, Commons_type*, Mapfile*); + do_allocate_commons_list(Layout*, Commons_section_type, Commons_type*, + Mapfile*, Sort_commons_order); + + // Returns all of the lines attached to LOC, not just the one the + // instruction actually came from. This helps the ODR checker avoid + // false positives. + static std::vector + linenos_from_loc(const Task* task, const Symbol_location& loc); // Implement detect_odr_violations. template @@ -1499,21 +1860,21 @@ class Symbol_table // Write globals specialized for size and endianness. template void - sized_write_globals(const Input_objects*, const Stringpool*, - const Stringpool*, Output_symtab_xindex*, - Output_symtab_xindex*, Output_file*) const; + sized_write_globals(const Stringpool*, const Stringpool*, + Output_symtab_xindex*, Output_symtab_xindex*, + Output_file*) const; // Write out a symbol to P. template void sized_write_symbol(Sized_symbol*, typename elfcpp::Elf_types::Elf_Addr value, - unsigned int shndx, + unsigned int shndx, elfcpp::STB, const Stringpool*, unsigned char* p) const; // Possibly warn about an undefined symbol from a dynamic object. void - warn_about_undefined_dynobj_symbol(const Input_objects*, Symbol*) const; + warn_about_undefined_dynobj_symbol(Symbol*) const; // Write out a section symbol, specialized for size and endianness. template @@ -1521,25 +1882,6 @@ class Symbol_table sized_write_section_symbol(const Output_section*, Output_symtab_xindex*, Output_file*, off_t) const; - // The type of the symbol hash table. - - typedef std::pair Symbol_table_key; - - struct Symbol_table_hash - { - size_t - operator()(const Symbol_table_key&) const; - }; - - struct Symbol_table_eq - { - bool - operator()(const Symbol_table_key&, const Symbol_table_key&) const; - }; - - typedef Unordered_map Symbol_table_type; - // The type of the list of symbols which have been forced local. typedef std::vector Forced_locals; @@ -1547,36 +1889,9 @@ class Symbol_table // they are defined. typedef Unordered_map Copied_symbol_dynobjs; - // A map from symbol name (as a pointer into the namepool) to all - // the locations the symbols is (weakly) defined (and certain other - // conditions are met). This map will be used later to detect - // possible One Definition Rule (ODR) violations. - struct Symbol_location - { - Object* object; // Object where the symbol is defined. - unsigned int shndx; // Section-in-object where the symbol is defined. - off_t offset; // Offset-in-section where the symbol is defined. - bool operator==(const Symbol_location& that) const - { - return (this->object == that.object - && this->shndx == that.shndx - && this->offset == that.offset); - } - }; - - struct Symbol_location_hash - { - size_t operator()(const Symbol_location& loc) const - { return reinterpret_cast(loc.object) ^ loc.offset ^ loc.shndx; } - }; - - typedef Unordered_map > - Odr_map; - // We increment this every time we see a new undefined symbol, for // use in archive groups. - int saw_undefined_; + size_t saw_undefined_; // The index of the first global symbol in the output file. unsigned int first_global_index_; // The file offset within the output symtab section where we should @@ -1609,6 +1924,10 @@ class Symbol_table // This is like the commons_ field, except that it holds TLS common // symbols. Commons_type tls_commons_; + // This is for small common symbols. + Commons_type small_commons_; + // This is for large common symbols. + Commons_type large_commons_; // A list of symbols which have been forced to be local. We don't // expect there to be very many of them, so we keep a list of them // rather than walking the whole table to find them. @@ -1627,6 +1946,7 @@ class Symbol_table // Information parsed from the version script, if any. const Version_script_info& version_script_; Garbage_collection* gc_; + Icf* icf_; }; // We inline get_sized_symbol for efficiency.