X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gold%2Fsymtab.cc;h=d8cda2d105cb92a604659314776337d832551ab4;hb=bbb3c81a449f089121b8d6d5527991dcd6dff0d3;hp=d5f699bf942e76cc16152656a0ce1d60e106ca1c;hpb=8c60465154ed694fac2531f65e7ca1ae51093174;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/symtab.cc b/gold/symtab.cc index d5f699bf94..d8cda2d105 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -1,6 +1,6 @@ // symtab.cc -- the gold symbol table -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -38,7 +38,7 @@ #include "target.h" #include "workqueue.h" #include "symtab.h" -#include "demangle.h" // needed for --dynamic-list-cpp-new +#include "script.h" #include "plugin.h" namespace gold @@ -59,24 +59,25 @@ Symbol::init_fields(const char* name, const char* version, this->symtab_index_ = 0; this->dynsym_index_ = 0; this->got_offsets_.init(); - this->plt_offset_ = 0; + this->plt_offset_ = -1U; this->type_ = type; this->binding_ = binding; this->visibility_ = visibility; this->nonvis_ = nonvis; - this->is_target_special_ = false; this->is_def_ = false; this->is_forwarder_ = false; this->has_alias_ = false; this->needs_dynsym_entry_ = false; this->in_reg_ = false; this->in_dyn_ = false; - this->has_plt_offset_ = false; this->has_warning_ = false; this->is_copied_from_dynobj_ = false; this->is_forced_local_ = false; this->is_ordinary_shndx_ = false; this->in_real_elf_ = false; + this->is_defined_in_discarded_section_ = false; + this->undef_binding_set_ = false; + this->undef_binding_weak_ = false; } // Return the demangled version of the symbol's name, but only @@ -307,7 +308,7 @@ Sized_symbol::allocate_common(Output_data* od, Value_type value) // table. inline bool -Symbol::should_add_dynsym_entry() const +Symbol::should_add_dynsym_entry(Symbol_table* symtab) const { // If the symbol is used by a dynamic relocation, we need to add it. if (this->needs_dynsym_entry()) @@ -325,7 +326,8 @@ Symbol::should_add_dynsym_entry() const bool is_ordinary; unsigned int shndx = this->shndx(&is_ordinary); if (is_ordinary && shndx != elfcpp::SHN_UNDEF - && !relobj->is_section_included(shndx)) + && !relobj->is_section_included(shndx) + && !symtab->is_section_folded(relobj, shndx)) return false; } @@ -394,7 +396,8 @@ Symbol::final_value_is_known() const { // If we are not generating an executable, then no final values are // known, since they will change at runtime. - if (parameters->options().shared() || parameters->options().relocatable()) + if (parameters->options().output_is_position_independent() + || parameters->options().relocatable()) return false; // If the symbol is not from an object file, and is not undefined, @@ -519,7 +522,7 @@ Symbol_table::Symbol_table_eq::operator()(const Symbol_table_key& k1, bool Symbol_table::is_section_folded(Object* obj, unsigned int shndx) const { - return (parameters->options().icf() + return (parameters->options().icf_enabled() && this->icf_->is_section_folded(obj, shndx)); } @@ -527,7 +530,7 @@ Symbol_table::is_section_folded(Object* obj, unsigned int shndx) const // work list to avoid gc'ing them. void -Symbol_table::gc_mark_undef_symbols() +Symbol_table::gc_mark_undef_symbols(Layout* layout) { for (options::String_set::const_iterator p = parameters->options().undefined_begin(); @@ -536,7 +539,7 @@ Symbol_table::gc_mark_undef_symbols() { const char* name = p->c_str(); Symbol* sym = this->lookup(name); - gold_assert (sym != NULL); + gold_assert(sym != NULL); if (sym->source() == Symbol::FROM_OBJECT && !sym->object()->is_dynamic()) { @@ -550,6 +553,27 @@ Symbol_table::gc_mark_undef_symbols() } } } + + for (Script_options::referenced_const_iterator p = + layout->script_options()->referenced_begin(); + p != layout->script_options()->referenced_end(); + ++p) + { + Symbol* sym = this->lookup(p->c_str()); + gold_assert(sym != NULL); + if (sym->source() == Symbol::FROM_OBJECT + && !sym->object()->is_dynamic()) + { + Relobj* obj = static_cast(sym->object()); + bool is_ordinary; + unsigned int shndx = sym->shndx(&is_ordinary); + if (is_ordinary) + { + gold_assert(this->gc_ != NULL); + this->gc_->worklist().push(Section_id(obj, shndx)); + } + } + } } void @@ -578,7 +602,7 @@ Symbol_table::gc_mark_dyn_syms(Symbol* sym) if (sym->in_dyn() && sym->source() == Symbol::FROM_OBJECT && !sym->object()->is_dynamic()) { - Relobj *obj = static_cast(sym->object()); + Relobj* obj = static_cast(sym->object()); bool is_ordinary; unsigned int shndx = sym->shndx(&is_ordinary); if (is_ordinary && shndx != elfcpp::SHN_UNDEF) @@ -688,13 +712,12 @@ Symbol_table::force_local(Symbol* sym) // option was used. const char* -Symbol_table::wrap_symbol(Object* object, const char* name, - Stringpool::Key* name_key) +Symbol_table::wrap_symbol(const char* name, Stringpool::Key* name_key) { // For some targets, we need to ignore a specific character when // wrapping, and add it back later. char prefix = '\0'; - if (name[0] == object->target()->wrap_char()) + if (name[0] == parameters->target().wrap_char()) { prefix = name[0]; ++name; @@ -813,13 +836,13 @@ Symbol_table::define_default_version(Sized_symbol* sym, // section index; IS_ORDINARY is whether this is a normal section // rather than a special code. -// If DEF is true, then this is the definition of a default version of -// a symbol. That means that any lookup of NAME/NULL and any lookup -// of NAME/VERSION should always return the same symbol. This is -// obvious for references, but in particular we want to do this for -// definitions: overriding NAME/NULL should also override -// NAME/VERSION. If we don't do that, it would be very hard to -// override functions in a shared library which uses versioning. +// If IS_DEFAULT_VERSION is true, then this is the definition of a +// default version of a symbol. That means that any lookup of +// NAME/NULL and any lookup of NAME/VERSION should always return the +// same symbol. This is obvious for references, but in particular we +// want to do this for definitions: overriding NAME/NULL should also +// override NAME/VERSION. If we don't do that, it would be very hard +// to override functions in a shared library which uses versioning. // We implement this by simply making both entries in the hash table // point to the same Symbol structure. That is easy enough if this is @@ -840,11 +863,11 @@ Symbol_table::define_default_version(Sized_symbol* sym, template Sized_symbol* Symbol_table::add_from_object(Object* object, - const char *name, + const char* name, Stringpool::Key name_key, - const char *version, + const char* version, Stringpool::Key version_key, - bool def, + bool is_default_version, const elfcpp::Sym& sym, unsigned int st_shndx, bool is_ordinary, @@ -864,7 +887,7 @@ Symbol_table::add_from_object(Object* object, if (orig_st_shndx == elfcpp::SHN_UNDEF && parameters->options().any_wrap()) { - const char* wrap_name = this->wrap_symbol(object, name, &name_key); + const char* wrap_name = this->wrap_symbol(name, &name_key); if (wrap_name != name) { // If we see a reference to malloc with version GLIBC_2.0, @@ -883,14 +906,14 @@ Symbol_table::add_from_object(Object* object, this->table_.insert(std::make_pair(std::make_pair(name_key, version_key), snull)); - std::pair insdef = + std::pair insdefault = std::make_pair(this->table_.end(), false); - if (def) + if (is_default_version) { const Stringpool::Key vnull_key = 0; - insdef = this->table_.insert(std::make_pair(std::make_pair(name_key, - vnull_key), - snull)); + insdefault = this->table_.insert(std::make_pair(std::make_pair(name_key, + vnull_key), + snull)); } // ins.first: an iterator, which is a pointer to a pair. @@ -915,20 +938,20 @@ Symbol_table::add_from_object(Object* object, if (parameters->options().gc_sections()) this->gc_mark_dyn_syms(ret); - if (def) - this->define_default_version(ret, insdef.second, - insdef.first); + if (is_default_version) + this->define_default_version(ret, insdefault.second, + insdefault.first); } else { // This is the first time we have seen NAME/VERSION. gold_assert(ins.first->second == NULL); - if (def && !insdef.second) + if (is_default_version && !insdefault.second) { // We already have an entry for NAME/NULL. If we override // it, then change it to NAME/VERSION. - ret = this->get_sized_symbol(insdef.first->second); + ret = this->get_sized_symbol(insdefault.first->second); was_undefined = ret->is_undefined(); was_common = ret->is_common(); @@ -945,7 +968,7 @@ Symbol_table::add_from_object(Object* object, was_common = false; Sized_target* target = - object->sized_target(); + parameters->sized_target(); if (!target->has_make_symbol()) ret = new Sized_symbol(); else @@ -955,12 +978,12 @@ Symbol_table::add_from_object(Object* object, { // This means that we don't want a symbol table // entry after all. - if (!def) + if (!is_default_version) this->table_.erase(ins.first); else { - this->table_.erase(insdef.first); - // Inserting insdef invalidated ins. + this->table_.erase(insdefault.first); + // Inserting INSDEFAULT invalidated INS. this->table_.erase(std::make_pair(name_key, version_key)); } @@ -971,16 +994,16 @@ Symbol_table::add_from_object(Object* object, ret->init_object(name, version, object, sym, st_shndx, is_ordinary); ins.first->second = ret; - if (def) + if (is_default_version) { // This is the first time we have seen NAME/NULL. Point // it at the new entry for NAME/VERSION. - gold_assert(insdef.second); - insdef.first->second = ret; + gold_assert(insdefault.second); + insdefault.first->second = ret; } } - if (def) + if (is_default_version) ret->set_is_default(); } @@ -1010,6 +1033,7 @@ Symbol_table::add_from_object(Object* object, if ((ret->visibility() == elfcpp::STV_HIDDEN || ret->visibility() == elfcpp::STV_INTERNAL) && (ret->binding() == elfcpp::STB_GLOBAL + || ret->binding() == elfcpp::STB_GNU_UNIQUE || ret->binding() == elfcpp::STB_WEAK) && !parameters->options().relocatable()) this->force_local(ret); @@ -1029,11 +1053,10 @@ Symbol_table::add_from_relobj( const char* sym_names, size_t sym_name_size, typename Sized_relobj::Symbols* sympointers, - size_t *defined) + size_t* defined) { *defined = 0; - gold_assert(size == relobj->target()->get_size()); gold_assert(size == parameters->target().get_size()); const int sym_size = elfcpp::Elf_sizes::sym_size; @@ -1070,10 +1093,15 @@ Symbol_table::add_from_relobj( // A symbol defined in a section which we are not including must // be treated as an undefined symbol. + bool is_defined_in_discarded_section = false; if (st_shndx != elfcpp::SHN_UNDEF && is_ordinary - && !relobj->is_section_included(st_shndx)) - st_shndx = elfcpp::SHN_UNDEF; + && !relobj->is_section_included(st_shndx) + && !this->is_section_folded(relobj, st_shndx)) + { + st_shndx = elfcpp::SHN_UNDEF; + is_defined_in_discarded_section = true; + } // In an object file, an '@' in the name separates the symbol // name from the version name. If there are two '@' characters, @@ -1081,9 +1109,10 @@ Symbol_table::add_from_relobj( const char* ver = strchr(name, '@'); Stringpool::Key ver_key = 0; int namelen = 0; - // DEF: is the version default? LOCAL: is the symbol forced local? - bool def = false; - bool local = false; + // IS_DEFAULT_VERSION: is the version default? + // IS_FORCED_LOCAL: is the symbol forced local? + bool is_default_version = false; + bool is_forced_local = false; if (ver != NULL) { @@ -1092,7 +1121,7 @@ Symbol_table::add_from_relobj( ++ver; if (*ver == '@') { - def = true; + is_default_version = true; ++ver; } ver = this->namepool_.add(ver, true, &ver_key); @@ -1109,21 +1138,21 @@ Symbol_table::add_from_relobj( // The symbol name did not have a version, but the // version script may assign a version anyway. std::string version; - if (this->version_script_.get_symbol_version(name, &version)) + bool is_global; + if (this->version_script_.get_symbol_version(name, &version, + &is_global)) { - // The version can be empty if the version script is - // only used to force some symbols to be local. - if (!version.empty()) + if (!is_global) + is_forced_local = true; + else if (!version.empty()) { ver = this->namepool_.add_with_length(version.c_str(), version.length(), true, &ver_key); - def = true; + is_default_version = true; } } - else if (this->version_script_.symbol_is_local(name)) - local = true; } } @@ -1151,7 +1180,8 @@ Symbol_table::add_from_relobj( } // Fix up visibility if object has no-export set. - if (relobj->no_export()) + if (relobj->no_export() + && (orig_st_shndx != elfcpp::SHN_UNDEF || !is_ordinary)) { // We may have copied symbol already above. if (psym != &sym2) @@ -1176,8 +1206,8 @@ Symbol_table::add_from_relobj( Sized_symbol* res; res = this->add_from_object(relobj, name, name_key, ver, ver_key, - def, *psym, st_shndx, is_ordinary, - orig_st_shndx); + is_default_version, *psym, st_shndx, + is_ordinary, orig_st_shndx); // If building a shared library using garbage collection, do not // treat externally visible symbols as garbage. @@ -1185,9 +1215,12 @@ Symbol_table::add_from_relobj( && parameters->options().shared()) this->gc_mark_symbol_for_shlib(res); - if (local) + if (is_forced_local) this->force_local(res); + if (is_defined_in_discarded_section) + res->set_is_defined_in_discarded_section(); + (*sympointers)[i] = res; } } @@ -1203,10 +1236,11 @@ Symbol_table::add_from_pluginobj( elfcpp::Sym* sym) { unsigned int st_shndx = sym->get_st_shndx(); + bool is_ordinary = st_shndx < elfcpp::SHN_LORESERVE; Stringpool::Key ver_key = 0; - bool def = false; - bool local = false; + bool is_default_version = false; + bool is_forced_local = false; if (ver != NULL) { @@ -1223,21 +1257,21 @@ Symbol_table::add_from_pluginobj( // The symbol name did not have a version, but the // version script may assign a version anyway. std::string version; - if (this->version_script_.get_symbol_version(name, &version)) + bool is_global; + if (this->version_script_.get_symbol_version(name, &version, + &is_global)) { - // The version can be empty if the version script is - // only used to force some symbols to be local. - if (!version.empty()) + if (!is_global) + is_forced_local = true; + else if (!version.empty()) { ver = this->namepool_.add_with_length(version.c_str(), version.length(), true, &ver_key); - def = true; + is_default_version = true; } } - else if (this->version_script_.symbol_is_local(name)) - local = true; } } @@ -1246,9 +1280,10 @@ Symbol_table::add_from_pluginobj( Sized_symbol* res; res = this->add_from_object(obj, name, name_key, ver, ver_key, - def, *sym, st_shndx, true, st_shndx); + is_default_version, *sym, st_shndx, + is_ordinary, st_shndx); - if (local) + if (is_forced_local) this->force_local(res); return res; @@ -1272,7 +1307,6 @@ Symbol_table::add_from_dynobj( { *defined = 0; - gold_assert(size == dynobj->target()->get_size()); gold_assert(size == parameters->target().get_size()); if (dynobj->just_symbols()) @@ -1424,10 +1458,11 @@ Symbol_table::add_from_dynobj( st_shndx); else { - const bool def = (!hidden - && st_shndx != elfcpp::SHN_UNDEF); + const bool is_default_version = + !hidden && st_shndx != elfcpp::SHN_UNDEF; res = this->add_from_object(dynobj, name, name_key, version, - version_key, def, *psym, st_shndx, + version_key, is_default_version, + *psym, st_shndx, is_ordinary, st_shndx); } } @@ -1546,7 +1581,7 @@ Sized_symbol* Symbol_table::define_special_symbol(const char** pname, const char** pversion, bool only_if_ref, Sized_symbol** poldsym, - bool *resolve_oldsym) + bool* resolve_oldsym) { *resolve_oldsym = false; @@ -1556,14 +1591,16 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, bool is_default_version = false; if (*pversion == NULL) { - if (this->version_script_.get_symbol_version(*pname, &v)) + bool is_global; + if (this->version_script_.get_symbol_version(*pname, &v, &is_global)) { - if (!v.empty()) - *pversion = v.c_str(); - - // If we get the version from a version script, then we are - // also the default version. - is_default_version = true; + if (is_global && !v.empty()) + { + *pversion = v.c_str(); + // If we get the version from a version script, then we + // are also the default version. + is_default_version = true; + } } } @@ -1603,14 +1640,15 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, version_key), snull)); - std::pair insdef = + std::pair insdefault = std::make_pair(this->table_.end(), false); if (is_default_version) { const Stringpool::Key vnull = 0; - insdef = this->table_.insert(std::make_pair(std::make_pair(name_key, - vnull), - snull)); + insdefault = + this->table_.insert(std::make_pair(std::make_pair(name_key, + vnull), + snull)); } if (!ins.second) @@ -1624,8 +1662,8 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, Sized_symbol* soldsym = this->get_sized_symbol(oldsym); this->define_default_version(soldsym, - insdef.second, - insdef.first); + insdefault.second, + insdefault.first); } } else @@ -1636,11 +1674,11 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, add_to_table = true; add_loc = ins.first; - if (is_default_version && !insdef.second) + if (is_default_version && !insdefault.second) { // We are adding NAME/VERSION, and it is the default // version. We already have an entry for NAME/NULL. - oldsym = insdef.first->second; + oldsym = insdefault.first->second; *resolve_oldsym = true; } else @@ -1650,7 +1688,7 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, if (is_default_version) { add_def_to_table = true; - add_def_loc = insdef.first; + add_def_loc = insdefault.first; } } } @@ -1661,11 +1699,8 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, sym = new Sized_symbol(); else { - gold_assert(target.get_size() == size); - gold_assert(target.is_big_endian() ? big_endian : !big_endian); - typedef Sized_target My_target; - const My_target* sized_target = - static_cast(&target); + Sized_target* sized_target = + parameters->sized_target(); sym = sized_target->make_symbol(); if (sym == NULL) return NULL; @@ -1689,6 +1724,7 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion, Symbol* Symbol_table::define_in_output_data(const char* name, const char* version, + Defined defined, Output_data* od, uint64_t value, uint64_t symsize, @@ -1702,7 +1738,7 @@ Symbol_table::define_in_output_data(const char* name, if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) - return this->do_define_in_output_data<32>(name, version, od, + return this->do_define_in_output_data<32>(name, version, defined, od, value, symsize, type, binding, visibility, nonvis, offset_is_from_end, @@ -1714,7 +1750,7 @@ Symbol_table::define_in_output_data(const char* name, else if (parameters->target().get_size() == 64) { #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) - return this->do_define_in_output_data<64>(name, version, od, + return this->do_define_in_output_data<64>(name, version, defined, od, value, symsize, type, binding, visibility, nonvis, offset_is_from_end, @@ -1734,6 +1770,7 @@ Sized_symbol* Symbol_table::do_define_in_output_data( const char* name, const char* version, + Defined defined, Output_data* od, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, @@ -1785,7 +1822,7 @@ Symbol_table::do_define_in_output_data( return sym; } - if (Symbol_table::should_override_with_special(oldsym)) + if (Symbol_table::should_override_with_special(oldsym, defined)) this->override_with_special(oldsym, sym); if (resolve_oldsym) @@ -1801,7 +1838,9 @@ Symbol_table::do_define_in_output_data( Symbol* Symbol_table::define_in_output_segment(const char* name, - const char* version, Output_segment* os, + const char* version, + Defined defined, + Output_segment* os, uint64_t value, uint64_t symsize, elfcpp::STT type, @@ -1814,7 +1853,7 @@ Symbol_table::define_in_output_segment(const char* name, if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) - return this->do_define_in_output_segment<32>(name, version, os, + return this->do_define_in_output_segment<32>(name, version, defined, os, value, symsize, type, binding, visibility, nonvis, offset_base, only_if_ref); @@ -1825,7 +1864,7 @@ Symbol_table::define_in_output_segment(const char* name, else if (parameters->target().get_size() == 64) { #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) - return this->do_define_in_output_segment<64>(name, version, os, + return this->do_define_in_output_segment<64>(name, version, defined, os, value, symsize, type, binding, visibility, nonvis, offset_base, only_if_ref); @@ -1844,6 +1883,7 @@ Sized_symbol* Symbol_table::do_define_in_output_segment( const char* name, const char* version, + Defined defined, Output_segment* os, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, @@ -1895,7 +1935,7 @@ Symbol_table::do_define_in_output_segment( return sym; } - if (Symbol_table::should_override_with_special(oldsym)) + if (Symbol_table::should_override_with_special(oldsym, defined)) this->override_with_special(oldsym, sym); if (resolve_oldsym) @@ -1913,6 +1953,7 @@ Symbol_table::do_define_in_output_segment( Symbol* Symbol_table::define_as_constant(const char* name, const char* version, + Defined defined, uint64_t value, uint64_t symsize, elfcpp::STT type, @@ -1925,7 +1966,7 @@ Symbol_table::define_as_constant(const char* name, if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) - return this->do_define_as_constant<32>(name, version, value, + return this->do_define_as_constant<32>(name, version, defined, value, symsize, type, binding, visibility, nonvis, only_if_ref, force_override); @@ -1936,7 +1977,7 @@ Symbol_table::define_as_constant(const char* name, else if (parameters->target().get_size() == 64) { #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) - return this->do_define_as_constant<64>(name, version, value, + return this->do_define_as_constant<64>(name, version, defined, value, symsize, type, binding, visibility, nonvis, only_if_ref, force_override); @@ -1955,6 +1996,7 @@ Sized_symbol* Symbol_table::do_define_as_constant( const char* name, const char* version, + Defined defined, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, elfcpp::STT type, @@ -2011,7 +2053,8 @@ Symbol_table::do_define_as_constant( return sym; } - if (force_override || Symbol_table::should_override_with_special(oldsym)) + if (force_override + || Symbol_table::should_override_with_special(oldsym, defined)) this->override_with_special(oldsym, sym); if (resolve_oldsym) @@ -2034,14 +2077,14 @@ Symbol_table::define_symbols(const Layout* layout, int count, { Output_section* os = layout->find_output_section(p->output_section); if (os != NULL) - this->define_in_output_data(p->name, NULL, os, p->value, + this->define_in_output_data(p->name, NULL, PREDEFINED, os, p->value, p->size, p->type, p->binding, p->visibility, p->nonvis, p->offset_is_from_end, only_if_ref || p->only_if_ref); else - this->define_as_constant(p->name, NULL, 0, p->size, p->type, - p->binding, p->visibility, p->nonvis, + this->define_as_constant(p->name, NULL, PREDEFINED, 0, p->size, + p->type, p->binding, p->visibility, p->nonvis, only_if_ref || p->only_if_ref, false); } @@ -2060,14 +2103,14 @@ Symbol_table::define_symbols(const Layout* layout, int count, p->segment_flags_set, p->segment_flags_clear); if (os != NULL) - this->define_in_output_segment(p->name, NULL, os, p->value, + this->define_in_output_segment(p->name, NULL, PREDEFINED, os, p->value, p->size, p->type, p->binding, p->visibility, p->nonvis, p->offset_base, only_if_ref || p->only_if_ref); else - this->define_as_constant(p->name, NULL, 0, p->size, p->type, - p->binding, p->visibility, p->nonvis, + this->define_as_constant(p->name, NULL, PREDEFINED, 0, p->size, + p->type, p->binding, p->visibility, p->nonvis, only_if_ref || p->only_if_ref, false); } @@ -2096,7 +2139,7 @@ Symbol_table::define_with_copy_reloc( if (binding == elfcpp::STB_WEAK) binding = elfcpp::STB_GLOBAL; - this->define_in_output_data(csym->name(), csym->version(), + this->define_in_output_data(csym->name(), csym->version(), COPY, posd, value, csym->symsize(), csym->type(), binding, csym->visibility(), csym->nonvis(), @@ -2141,14 +2184,15 @@ Symbol_table::get_copy_source(const Symbol* sym) const // Add any undefined symbols named on the command line. void -Symbol_table::add_undefined_symbols_from_command_line() +Symbol_table::add_undefined_symbols_from_command_line(Layout* layout) { - if (parameters->options().any_undefined()) + if (parameters->options().any_undefined() + || layout->script_options()->any_unreferenced()) { if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) - this->do_add_undefined_symbols_from_command_line<32>(); + this->do_add_undefined_symbols_from_command_line<32>(layout); #else gold_unreachable(); #endif @@ -2156,7 +2200,7 @@ Symbol_table::add_undefined_symbols_from_command_line() else if (parameters->target().get_size() == 64) { #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) - this->do_add_undefined_symbols_from_command_line<64>(); + this->do_add_undefined_symbols_from_command_line<64>(layout); #else gold_unreachable(); #endif @@ -2168,50 +2212,59 @@ Symbol_table::add_undefined_symbols_from_command_line() template void -Symbol_table::do_add_undefined_symbols_from_command_line() +Symbol_table::do_add_undefined_symbols_from_command_line(Layout* layout) { for (options::String_set::const_iterator p = parameters->options().undefined_begin(); p != parameters->options().undefined_end(); ++p) - { - const char* name = p->c_str(); + this->add_undefined_symbol_from_command_line(p->c_str()); - if (this->lookup(name) != NULL) - continue; + for (Script_options::referenced_const_iterator p = + layout->script_options()->referenced_begin(); + p != layout->script_options()->referenced_end(); + ++p) + this->add_undefined_symbol_from_command_line(p->c_str()); +} - const char* version = NULL; +template +void +Symbol_table::add_undefined_symbol_from_command_line(const char* name) +{ + if (this->lookup(name) != NULL) + return; - Sized_symbol* sym; - Sized_symbol* oldsym; - bool resolve_oldsym; - if (parameters->target().is_big_endian()) - { + const char* version = NULL; + + Sized_symbol* sym; + Sized_symbol* oldsym; + bool resolve_oldsym; + if (parameters->target().is_big_endian()) + { #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG) - sym = this->define_special_symbol(&name, &version, - false, &oldsym, - &resolve_oldsym); + sym = this->define_special_symbol(&name, &version, + false, &oldsym, + &resolve_oldsym); #else - gold_unreachable(); + gold_unreachable(); #endif - } - else - { + } + else + { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE) - sym = this->define_special_symbol(&name, &version, - false, &oldsym, - &resolve_oldsym); + sym = this->define_special_symbol(&name, &version, + false, &oldsym, + &resolve_oldsym); #else - gold_unreachable(); + gold_unreachable(); #endif - } + } - gold_assert(oldsym == NULL); + gold_assert(oldsym == NULL); - sym->init_undefined(name, version, elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL, - elfcpp::STV_DEFAULT, 0); - ++this->saw_undefined_; - } + sym->init_undefined(name, version, elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL, + elfcpp::STV_DEFAULT, 0); + ++this->saw_undefined_; } // Set the dynamic symbol indexes. INDEX is the index of the first @@ -2235,7 +2288,7 @@ Symbol_table::set_dynsym_indexes(unsigned int index, // some symbols appear more than once in the symbol table, with // and without a version. - if (!sym->should_add_dynsym_entry()) + if (!sym->should_add_dynsym_entry(this)) sym->set_dynsym_index(-1U); else if (!sym->has_dynsym_index()) { @@ -2247,6 +2300,12 @@ Symbol_table::set_dynsym_indexes(unsigned int index, // Record any version information. if (sym->version() != NULL) versions->record_version(this, dynpool, sym); + + // If the symbol is defined in a dynamic object and is + // referenced in a regular object, then mark the dynamic + // object as needed. This is used to implement --as-needed. + if (sym->is_from_dynobj() && sym->in_reg()) + sym->object()->set_is_needed(); } } @@ -2265,7 +2324,7 @@ Symbol_table::set_dynsym_indexes(unsigned int index, off_t Symbol_table::finalize(off_t off, off_t dynoff, size_t dyn_global_index, size_t dyncount, Stringpool* pool, - unsigned int *plocal_symcount) + unsigned int* plocal_symcount) { off_t ret; @@ -2361,30 +2420,17 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool, return off; } -// Finalize the symbol SYM. This returns true if the symbol should be -// added to the symbol table, false otherwise. +// 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 -bool -Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) +typename Sized_symbol::Value_type +Symbol_table::compute_final_value( + const Sized_symbol* sym, + Compute_final_value_status* pstatus) const { typedef typename Sized_symbol::Value_type Value_type; - - Sized_symbol* sym = static_cast*>(unsized_sym); - - // The default version of a symbol may appear twice in the symbol - // table. We only need to finalize it once. - if (sym->has_symtab_index()) - return false; - - if (!sym->in_reg()) - { - gold_assert(!sym->has_symtab_index()); - sym->set_symtab_index(-1U); - gold_assert(sym->dynsym_index() == -1U); - return false; - } - Value_type value; switch (sym->source()) @@ -2398,9 +2444,8 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) && shndx != elfcpp::SHN_ABS && !Symbol::is_common_shndx(shndx)) { - gold_error(_("%s: unsupported symbol section 0x%x"), - sym->demangled_name().c_str(), shndx); - shndx = elfcpp::SHN_UNDEF; + *pstatus = CFVS_UNSUPPORTED_SYMBOL_SECTION; + return 0; } Object* symobj = sym->object(); @@ -2424,7 +2469,6 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) { Relobj* relobj = static_cast(symobj); Output_section* os = relobj->output_section(shndx); - uint64_t secoff64 = relobj->output_section_offset(shndx); if (this->is_section_folded(relobj, shndx)) { @@ -2434,19 +2478,25 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) shndx); gold_assert(folded.first != NULL); Relobj* folded_obj = reinterpret_cast(folded.first); - os = folded_obj->output_section(folded.second); + unsigned folded_shndx = folded.second; + + os = folded_obj->output_section(folded_shndx); gold_assert(os != NULL); - secoff64 = folded_obj->output_section_offset(folded.second); + + // Replace (relobj, shndx) with canonical ICF input section. + shndx = folded_shndx; + relobj = folded_obj; } + uint64_t secoff64 = relobj->output_section_offset(shndx); if (os == NULL) { - sym->set_symtab_index(-1U); bool static_or_reloc = (parameters->doing_static_link() || parameters->options().relocatable()); gold_assert(static_or_reloc || sym->dynsym_index() == -1U); - return false; + *pstatus = CFVS_NO_OUTPUT_SECTION; + return 0; } if (secoff64 == -1ULL) @@ -2519,6 +2569,57 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) gold_unreachable(); } + *pstatus = CFVS_OK; + return value; +} + +// Finalize the symbol SYM. This returns true if the symbol should be +// added to the symbol table, false otherwise. + +template +bool +Symbol_table::sized_finalize_symbol(Symbol* unsized_sym) +{ + typedef typename Sized_symbol::Value_type Value_type; + + Sized_symbol* sym = static_cast*>(unsized_sym); + + // The default version of a symbol may appear twice in the symbol + // table. We only need to finalize it once. + if (sym->has_symtab_index()) + return false; + + if (!sym->in_reg()) + { + gold_assert(!sym->has_symtab_index()); + sym->set_symtab_index(-1U); + gold_assert(sym->dynsym_index() == -1U); + return false; + } + + // Compute final symbol value. + Compute_final_value_status status; + Value_type value = this->compute_final_value(sym, &status); + + switch (status) + { + case CFVS_OK: + break; + case CFVS_UNSUPPORTED_SYMBOL_SECTION: + { + bool is_ordinary; + unsigned int shndx = sym->shndx(&is_ordinary); + gold_error(_("%s: unsupported symbol section 0x%x"), + sym->demangled_name().c_str(), shndx); + } + break; + case CFVS_NO_OUTPUT_SECTION: + sym->set_symtab_index(-1U); + return false; + default: + gold_unreachable(); + } + sym->set_value(value); if (parameters->options().strip_all() @@ -2629,6 +2730,7 @@ Symbol_table::sized_write_globals(const Stringpool* sympool, unsigned int shndx; typename elfcpp::Elf_types::Elf_Addr sym_value = sym->value(); typename elfcpp::Elf_types::Elf_Addr dynsym_value = sym_value; + elfcpp::STB binding = sym->binding(); switch (sym->source()) { case Symbol::FROM_OBJECT: @@ -2652,6 +2754,10 @@ Symbol_table::sized_write_globals(const Stringpool* sympool, if (sym->needs_dynsym_value()) dynsym_value = target.dynsym_value(sym); shndx = elfcpp::SHN_UNDEF; + if (sym->is_undef_binding_weak()) + binding = elfcpp::STB_WEAK; + else + binding = elfcpp::STB_GLOBAL; } else if (symobj->pluginobj() != NULL) shndx = elfcpp::SHN_UNDEF; @@ -2732,7 +2838,7 @@ Symbol_table::sized_write_globals(const Stringpool* sympool, gold_assert(sym_index < output_count); unsigned char* ps = psyms + (sym_index * sym_size); this->sized_write_symbol(sym, sym_value, shndx, - sympool, ps); + binding, sympool, ps); } if (dynsym_index != -1U) @@ -2741,7 +2847,7 @@ Symbol_table::sized_write_globals(const Stringpool* sympool, gold_assert(dynsym_index < dynamic_count); unsigned char* pd = dynamic_view + (dynsym_index * sym_size); this->sized_write_symbol(sym, dynsym_value, shndx, - dynpool, pd); + binding, dynpool, pd); } } @@ -2759,6 +2865,7 @@ Symbol_table::sized_write_symbol( Sized_symbol* sym, typename elfcpp::Elf_types::Elf_Addr value, unsigned int shndx, + elfcpp::STB binding, const Stringpool* pool, unsigned char* p) const { @@ -2770,11 +2877,16 @@ Symbol_table::sized_write_symbol( osym.put_st_size(0); else osym.put_st_size(sym->symsize()); + elfcpp::STT type = sym->type(); + // Turn IFUNC symbols from shared libraries into normal FUNC symbols. + if (type == elfcpp::STT_GNU_IFUNC + && sym->is_from_dynobj()) + type = elfcpp::STT_FUNC; // A version script may have overridden the default binding. if (sym->is_forced_local()) - osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, sym->type())); + osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, type)); else - osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type())); + osym.put_st_info(elfcpp::elf_st_info(binding, type)); osym.put_st_other(elfcpp::elf_st_other(sym->visibility(), sym->nonvis())); osym.put_st_shndx(shndx); } @@ -2815,7 +2927,7 @@ Symbol_table::warn_about_undefined_dynobj_symbol(Symbol* sym) const // Write out a section symbol. Return the update offset. void -Symbol_table::write_section_symbol(const Output_section *os, +Symbol_table::write_section_symbol(const Output_section* os, Output_symtab_xindex* symtab_xindex, Output_file* of, off_t offset) const @@ -2941,8 +3053,11 @@ Symbol_table::detect_odr_violations(const Task* task, ++it) { const char* symbol_name = it->first; - // We use a sorted set so the output is deterministic. - std::set line_nums; + // Maps from symbol location to a sample object file we found + // that location in. We use a sorted map so the location order + // is deterministic, but we only store an arbitrary object file + // to avoid copying lots of names. + std::map line_nums; for (Unordered_set::const_iterator locs = it->second.begin(); @@ -2961,7 +3076,11 @@ Symbol_table::detect_odr_violations(const Task* task, std::string lineno = Dwarf_line_info::one_addr2line( locs->object, locs->shndx, locs->offset, 16); if (!lineno.empty()) - line_nums.insert(lineno); + { + std::string& sample_object = line_nums[lineno]; + if (sample_object.empty()) + sample_object = locs->object->name(); + } } if (line_nums.size() > 1) @@ -2969,10 +3088,12 @@ Symbol_table::detect_odr_violations(const Task* task, gold_warning(_("while linking %s: symbol '%s' defined in multiple " "places (possible ODR violation):"), output_file_name, demangle(symbol_name).c_str()); - for (std::set::const_iterator it2 = line_nums.begin(); - it2 != line_nums.end(); - ++it2) - fprintf(stderr, " %s\n", it2->c_str()); + for (std::map::const_iterator it2 = + line_nums.begin(); + it2 != line_nums.end(); + ++it2) + fprintf(stderr, _(" %s from %s\n"), + it2->first.c_str(), it2->second.c_str()); } } // We only call one_addr2line() in this function, so we can clear its cache.