X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fsymtab.cc;h=30ed8f787411dee2c22a2bb7b3e9f5cbe4dbeb8b;hb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;hp=4a1c5ee9ef78cb362ad1f1a7e0a0c9e10fbd6653;hpb=99f8facac923848a9496cc34235b608e05a7f160;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/symtab.cc b/gold/symtab.cc index 4a1c5ee9ef..30ed8f7874 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -1,6 +1,6 @@ // symtab.cc -- the gold symbol table -// Copyright 2006, 2007 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -22,12 +22,15 @@ #include "gold.h" +#include #include +#include #include #include #include #include "demangle.h" +#include "gc.h" #include "object.h" #include "dwarf_reader.h" #include "dynobj.h" @@ -35,6 +38,8 @@ #include "target.h" #include "workqueue.h" #include "symtab.h" +#include "demangle.h" // needed for --dynamic-list-cpp-new +#include "plugin.h" namespace gold { @@ -45,20 +50,20 @@ namespace gold // and source_. void -Symbol::init_fields(const char* name, const char* version, - elfcpp::STT type, elfcpp::STB binding, - elfcpp::STV visibility, unsigned char nonvis) +Symbol::init_fields(const char* aname, const char* aversion, + elfcpp::STT atype, elfcpp::STB abinding, + elfcpp::STV avisibility, unsigned char non_vis) { - this->name_ = name; - this->version_ = version; + this->name_ = aname; + this->version_ = aversion; this->symtab_index_ = 0; this->dynsym_index_ = 0; - this->got_offset_ = 0; + this->got_offsets_.init(); this->plt_offset_ = 0; - this->type_ = type; - this->binding_ = binding; - this->visibility_ = visibility; - this->nonvis_ = nonvis; + this->type_ = atype; + this->binding_ = abinding; + this->visibility_ = avisibility; + this->nonvis_ = non_vis; this->is_target_special_ = false; this->is_def_ = false; this->is_forwarder_ = false; @@ -66,26 +71,28 @@ Symbol::init_fields(const char* name, const char* version, this->needs_dynsym_entry_ = false; this->in_reg_ = false; this->in_dyn_ = false; - this->has_got_offset_ = 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; } // Return the demangled version of the symbol's name, but only // if the --demangle flag was set. static std::string -demangle(const char* name) +demangle(const char* aname) { - if (!parameters->demangle()) - return name; + if (!parameters->options().do_demangle()) + return aname; // cplus_demangle allocates memory for the result it returns, // and returns NULL if the name is already demangled. - char* demangled_name = cplus_demangle(name, DMGL_ANSI | DMGL_PARAMS); + char* demangled_name = cplus_demangle(aname, DMGL_ANSI | DMGL_PARAMS); if (demangled_name == NULL) - return name; + return aname; std::string retval(demangled_name); free(demangled_name); @@ -102,60 +109,83 @@ Symbol::demangled_name() const template void -Symbol::init_base(const char* name, const char* version, Object* object, - const elfcpp::Sym& sym) +Symbol::init_base_object(const char* aname, const char* aversion, Object* aobject, + const elfcpp::Sym& sym, + unsigned int st_shndx, bool is_ordinary) { - this->init_fields(name, version, sym.get_st_type(), sym.get_st_bind(), + this->init_fields(aname, aversion, sym.get_st_type(), sym.get_st_bind(), sym.get_st_visibility(), sym.get_st_nonvis()); - this->u_.from_object.object = object; - // FIXME: Handle SHN_XINDEX. - this->u_.from_object.shndx = sym.get_st_shndx(); + this->u_.from_object.object = aobject; + this->u_.from_object.shndx = st_shndx; + this->is_ordinary_shndx_ = is_ordinary; this->source_ = FROM_OBJECT; - this->in_reg_ = !object->is_dynamic(); - this->in_dyn_ = object->is_dynamic(); + this->in_reg_ = !aobject->is_dynamic(); + this->in_dyn_ = aobject->is_dynamic(); + this->in_real_elf_ = aobject->pluginobj() == NULL; } // Initialize the fields in the base class Symbol for a symbol defined // in an Output_data. void -Symbol::init_base(const char* name, Output_data* od, elfcpp::STT type, - elfcpp::STB binding, elfcpp::STV visibility, - unsigned char nonvis, bool offset_is_from_end) +Symbol::init_base_output_data(const char* aname, const char* aversion, + Output_data* od, elfcpp::STT atype, + elfcpp::STB abinding, elfcpp::STV avisibility, + unsigned char non_vis, bool offset_is_from_the_end) { - this->init_fields(name, NULL, type, binding, visibility, nonvis); + this->init_fields(aname, aversion, atype, abinding, avisibility, non_vis); this->u_.in_output_data.output_data = od; - this->u_.in_output_data.offset_is_from_end = offset_is_from_end; + this->u_.in_output_data.offset_is_from_end = offset_is_from_the_end; this->source_ = IN_OUTPUT_DATA; this->in_reg_ = true; + this->in_real_elf_ = true; } // Initialize the fields in the base class Symbol for a symbol defined // in an Output_segment. void -Symbol::init_base(const char* name, Output_segment* os, elfcpp::STT type, - elfcpp::STB binding, elfcpp::STV visibility, - unsigned char nonvis, Segment_offset_base offset_base) +Symbol::init_base_output_segment(const char* aname, const char* aversion, + Output_segment* os, elfcpp::STT atype, + elfcpp::STB abinding, elfcpp::STV avisibility, + unsigned char non_vis, + Segment_offset_base offsetbase) { - this->init_fields(name, NULL, type, binding, visibility, nonvis); + this->init_fields(aname, aversion, atype, abinding, avisibility, non_vis); this->u_.in_output_segment.output_segment = os; - this->u_.in_output_segment.offset_base = offset_base; + this->u_.in_output_segment.offset_base = offsetbase; this->source_ = IN_OUTPUT_SEGMENT; this->in_reg_ = true; + this->in_real_elf_ = true; } // Initialize the fields in the base class Symbol for a symbol defined // as a constant. void -Symbol::init_base(const char* name, elfcpp::STT type, - elfcpp::STB binding, elfcpp::STV visibility, - unsigned char nonvis) +Symbol::init_base_constant(const char* aname, const char* aversion, + elfcpp::STT atype, elfcpp::STB abinding, + elfcpp::STV avisibility, unsigned char non_vis) { - this->init_fields(name, NULL, type, binding, visibility, nonvis); - this->source_ = CONSTANT; + this->init_fields(aname, aversion, atype, abinding, avisibility, non_vis); + this->source_ = IS_CONSTANT; this->in_reg_ = true; + this->in_real_elf_ = true; +} + +// Initialize the fields in the base class Symbol for an undefined +// symbol. + +void +Symbol::init_base_undefined(const char* aname, const char* aversion, + elfcpp::STT atype, elfcpp::STB abinding, + elfcpp::STV avisibility, unsigned char non_vis) +{ + this->init_fields(aname, aversion, atype, abinding, avisibility, non_vis); + this->dynsym_index_ = -1U; + this->source_ = IS_UNDEFINED; + this->in_reg_ = true; + this->in_real_elf_ = true; } // Allocate a common symbol in the base. @@ -174,10 +204,12 @@ Symbol::allocate_base_common(Output_data* od) template template void -Sized_symbol::init(const char* name, const char* version, Object* object, - const elfcpp::Sym& sym) +Sized_symbol::init_object(const char* aname, const char* aversion, + Object* aobject, + const elfcpp::Sym& sym, + unsigned int st_shndx, bool is_ordinary) { - this->init_base(name, version, object, sym); + this->init_base_object(aname, aversion, aobject, sym, st_shndx, is_ordinary); this->value_ = sym.get_st_value(); this->symsize_ = sym.get_st_size(); } @@ -187,16 +219,18 @@ Sized_symbol::init(const char* name, const char* version, Object* object, template void -Sized_symbol::init(const char* name, Output_data* od, - Value_type value, Size_type symsize, - elfcpp::STT type, elfcpp::STB binding, - elfcpp::STV visibility, unsigned char nonvis, - bool offset_is_from_end) +Sized_symbol::init_output_data(const char* aname, const char* aversion, + Output_data* od, Value_type avalue, + Size_type sym_size, elfcpp::STT atype, + elfcpp::STB abinding, + elfcpp::STV avisibility, + unsigned char non_vis, + bool offset_is_from_the_end) { - this->init_base(name, od, type, binding, visibility, nonvis, - offset_is_from_end); - this->value_ = value; - this->symsize_ = symsize; + this->init_base_output_data(aname, aversion, od, atype, abinding, avisibility, + non_vis, offset_is_from_the_end); + this->value_ = avalue; + this->symsize_ = sym_size; } // Initialize the fields in Sized_symbol for a symbol defined in an @@ -204,15 +238,18 @@ Sized_symbol::init(const char* name, Output_data* od, template void -Sized_symbol::init(const char* name, Output_segment* os, - Value_type value, Size_type symsize, - elfcpp::STT type, elfcpp::STB binding, - elfcpp::STV visibility, unsigned char nonvis, - Segment_offset_base offset_base) +Sized_symbol::init_output_segment(const char* aname, const char* aversion, + Output_segment* os, Value_type avalue, + Size_type sym_size, elfcpp::STT atype, + elfcpp::STB abinding, + elfcpp::STV avisibility, + unsigned char non_vis, + Segment_offset_base offsetbase) { - this->init_base(name, os, type, binding, visibility, nonvis, offset_base); - this->value_ = value; - this->symsize_ = symsize; + this->init_base_output_segment(aname, aversion, os, atype, abinding, avisibility, + non_vis, offsetbase); + this->value_ = avalue; + this->symsize_ = sym_size; } // Initialize the fields in Sized_symbol for a symbol defined as a @@ -220,25 +257,52 @@ Sized_symbol::init(const char* name, Output_segment* os, template void -Sized_symbol::init(const char* name, Value_type value, Size_type symsize, - elfcpp::STT type, elfcpp::STB binding, - elfcpp::STV visibility, unsigned char nonvis) +Sized_symbol::init_constant(const char* aname, const char* aversion, + Value_type avalue, Size_type sym_size, + elfcpp::STT atype, elfcpp::STB abinding, + elfcpp::STV avisibility, unsigned char non_vis) { - this->init_base(name, type, binding, visibility, nonvis); - this->value_ = value; - this->symsize_ = symsize; + this->init_base_constant(aname, aversion, atype, abinding, avisibility, non_vis); + this->value_ = avalue; + this->symsize_ = sym_size; +} + +// Initialize the fields in Sized_symbol for an undefined symbol. + +template +void +Sized_symbol::init_undefined(const char* aname, const char* aversion, + elfcpp::STT atype, elfcpp::STB abinding, + elfcpp::STV avisibility, unsigned char non_vis) +{ + this->init_base_undefined(aname, aversion, atype, abinding, avisibility, non_vis); + this->value_ = 0; + this->symsize_ = 0; +} + +// Return true if SHNDX represents a common symbol. + +bool +Symbol::is_common_shndx(unsigned int sec_shndx) +{ + return (sec_shndx == elfcpp::SHN_COMMON + || sec_shndx == parameters->target().small_common_shndx() + || sec_shndx == parameters->target().large_common_shndx()); } // Allocate a common symbol. template void -Sized_symbol::allocate_common(Output_data* od, Value_type value) +Sized_symbol::allocate_common(Output_data* od, Value_type avalue) { this->allocate_base_common(od); - this->value_ = value; + this->value_ = avalue; } +// The ""'s around str ensure str is a string literal, so sizeof works. +#define strprefix(var, str) (strncmp(var, str, sizeof("" str "") - 1) == 0) + // Return true if this symbol should be added to the dynamic symbol // table. @@ -249,10 +313,72 @@ Symbol::should_add_dynsym_entry() const if (this->needs_dynsym_entry()) return true; + // If this symbol's section is not added, the symbol need not be added. + // The section may have been GCed. Note that export_dynamic is being + // overridden here. This should not be done for shared objects. + if (parameters->options().gc_sections() + && !parameters->options().shared() + && this->source() == Symbol::FROM_OBJECT + && !this->object()->is_dynamic()) + { + Relobj* relobj = static_cast(this->object()); + bool is_ordinary; + unsigned int sec_shndx = this->shndx(&is_ordinary); + if (is_ordinary && sec_shndx != elfcpp::SHN_UNDEF + && !relobj->is_section_included(sec_shndx)) + return false; + } + + // If the symbol was forced local in a version script, do not add it. + if (this->is_forced_local()) + return false; + + // If the symbol was forced dynamic in a --dynamic-list file, add it. + if (parameters->options().in_dynamic_list(this->name())) + return true; + + // If dynamic-list-data was specified, add any STT_OBJECT. + if (parameters->options().dynamic_list_data() + && !this->is_from_dynobj() + && this->type() == elfcpp::STT_OBJECT) + return true; + + // If --dynamic-list-cpp-new was specified, add any new/delete symbol. + // If --dynamic-list-cpp-typeinfo was specified, add any typeinfo symbols. + if ((parameters->options().dynamic_list_cpp_new() + || parameters->options().dynamic_list_cpp_typeinfo()) + && !this->is_from_dynobj()) + { + // TODO(csilvers): We could probably figure out if we're an operator + // new/delete or typeinfo without the need to demangle. + char* ademangled_name = cplus_demangle(this->name(), + DMGL_ANSI | DMGL_PARAMS); + if (ademangled_name == NULL) + { + // Not a C++ symbol, so it can't satisfy these flags + } + else if (parameters->options().dynamic_list_cpp_new() + && (strprefix(ademangled_name, "operator new") + || strprefix(ademangled_name, "operator delete"))) + { + free(ademangled_name); + return true; + } + else if (parameters->options().dynamic_list_cpp_typeinfo() + && (strprefix(ademangled_name, "typeinfo name for") + || strprefix(ademangled_name, "typeinfo for"))) + { + free(ademangled_name); + return true; + } + else + free(ademangled_name); + } + // If exporting all symbols or building a shared library, // and the symbol is defined in a regular object and is // externally visible, we need to add it. - if ((parameters->export_dynamic() || parameters->output_is_shared()) + if ((parameters->options().export_dynamic() || parameters->options().shared()) && !this->is_from_dynobj() && this->is_externally_visible()) return true; @@ -268,23 +394,29 @@ 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->output_is_executable()) + if (parameters->options().output_is_position_independent() + || parameters->options().relocatable()) return false; - // If the symbol is not from an object file, then it is defined, and - // known. + // If the symbol is not from an object file, and is not undefined, + // then it is defined, and known. if (this->source_ != FROM_OBJECT) - return true; - - // If the symbol is from a dynamic object, then the final value is - // not known. - if (this->object()->is_dynamic()) - return false; + { + if (this->source_ != IS_UNDEFINED) + return true; + } + else + { + // If the symbol is from a dynamic object, then the final value + // is not known. + if (this->object()->is_dynamic()) + return false; - // If the symbol is not undefined (it is defined or common), then - // the final value is known. - if (!this->is_undefined()) - return true; + // If the symbol is not undefined (it is defined or common), + // then the final value is known. + if (!this->is_undefined()) + return true; + } // If the symbol is undefined, then whether the final value is known // depends on whether we are doing a static link. If we are doing a @@ -293,11 +425,72 @@ Symbol::final_value_is_known() const return parameters->doing_static_link(); } +// Return the output section where this symbol is defined. + +Output_section* +Symbol::output_section() const +{ + switch (this->source_) + { + case FROM_OBJECT: + { + unsigned int sec_shndx = this->u_.from_object.shndx; + if (sec_shndx != elfcpp::SHN_UNDEF && this->is_ordinary_shndx_) + { + gold_assert(!this->u_.from_object.object->is_dynamic()); + gold_assert(this->u_.from_object.object->pluginobj() == NULL); + Relobj* relobj = static_cast(this->u_.from_object.object); + return relobj->output_section(sec_shndx); + } + return NULL; + } + + case IN_OUTPUT_DATA: + return this->u_.in_output_data.output_data->output_section(); + + case IN_OUTPUT_SEGMENT: + case IS_CONSTANT: + case IS_UNDEFINED: + return NULL; + + default: + gold_unreachable(); + } +} + +// Set the symbol's output section. This is used for symbols defined +// in scripts. This should only be called after the symbol table has +// been finalized. + +void +Symbol::set_output_section(Output_section* os) +{ + switch (this->source_) + { + case FROM_OBJECT: + case IN_OUTPUT_DATA: + gold_assert(this->output_section() == os); + break; + case IS_CONSTANT: + this->source_ = IN_OUTPUT_DATA; + this->u_.in_output_data.output_data = os; + this->u_.in_output_data.offset_is_from_end = false; + break; + case IN_OUTPUT_SEGMENT: + case IS_UNDEFINED: + default: + gold_unreachable(); + } +} + // Class Symbol_table. -Symbol_table::Symbol_table(unsigned int count) +Symbol_table::Symbol_table(unsigned int count, + const Version_script_info& aversion_script) : saw_undefined_(0), offset_(0), table_(count), namepool_(), - forwarders_(), commons_(), warnings_() + forwarders_(), commons_(), tls_commons_(), small_commons_(), + large_commons_(), forced_locals_(), warnings_(), + version_script_(aversion_script), gc_(NULL), icf_(NULL) { namepool_.reserve(count); } @@ -324,6 +517,79 @@ Symbol_table::Symbol_table_eq::operator()(const Symbol_table_key& k1, return k1.first == k2.first && k1.second == k2.second; } +bool +Symbol_table::is_section_folded(Object* obj, unsigned int sec_shndx) const +{ + return (parameters->options().icf_enabled() + && this->icf_->is_section_folded(obj, sec_shndx)); +} + +// For symbols that have been listed with -u option, add them to the +// work list to avoid gc'ing them. + +void +Symbol_table::gc_mark_undef_symbols() +{ + for (options::String_set::const_iterator p = + parameters->options().undefined_begin(); + p != parameters->options().undefined_end(); + ++p) + { + const char* aname = p->c_str(); + Symbol* sym = this->lookup(aname); + 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 sec_shndx = sym->shndx(&is_ordinary); + if (is_ordinary) + { + gold_assert(this->gc_ != NULL); + this->gc_->worklist().push(Section_id(obj, sec_shndx)); + } + } + } +} + +void +Symbol_table::gc_mark_symbol_for_shlib(Symbol* sym) +{ + if (!sym->is_from_dynobj() + && sym->is_externally_visible()) + { + //Add the object and section to the work list. + Relobj* obj = static_cast(sym->object()); + bool is_ordinary; + unsigned int sec_shndx = sym->shndx(&is_ordinary); + if (is_ordinary && sec_shndx != elfcpp::SHN_UNDEF) + { + gold_assert(this->gc_!= NULL); + this->gc_->worklist().push(Section_id(obj, sec_shndx)); + } + } +} + +// When doing garbage collection, keep symbols that have been seen in +// dynamic objects. +inline void +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()); + bool is_ordinary; + unsigned int sec_shndx = sym->shndx(&is_ordinary); + if (is_ordinary && sec_shndx != elfcpp::SHN_UNDEF) + { + gold_assert(this->gc_ != NULL); + this->gc_->worklist().push(Section_id(obj, sec_shndx)); + } + } +} + // Make TO a symbol which forwards to FROM. void @@ -350,18 +616,18 @@ Symbol_table::resolve_forwards(const Symbol* from) const // Look up a symbol by name. Symbol* -Symbol_table::lookup(const char* name, const char* version) const +Symbol_table::lookup(const char* aname, const char* aversion) const { Stringpool::Key name_key; - name = this->namepool_.find(name, &name_key); - if (name == NULL) + aname = this->namepool_.find(aname, &name_key); + if (aname == NULL) return NULL; Stringpool::Key version_key = 0; - if (version != NULL) + if (aversion != NULL) { - version = this->namepool_.find(version, &version_key); - if (version == NULL) + aversion = this->namepool_.find(aversion, &version_key); + if (aversion == NULL) return NULL; } @@ -380,27 +646,172 @@ Symbol_table::lookup(const char* name, const char* version) const template void -Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from, - const char* version ACCEPT_SIZE_ENDIAN) +Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from) { unsigned char buf[elfcpp::Elf_sizes::sym_size]; elfcpp::Sym_write esym(buf); - // We don't bother to set the st_name field. + // We don't bother to set the st_name or the st_shndx field. esym.put_st_value(from->value()); esym.put_st_size(from->symsize()); esym.put_st_info(from->binding(), from->type()); esym.put_st_other(from->visibility(), from->nonvis()); - esym.put_st_shndx(from->shndx()); - this->resolve(to, esym.sym(), esym.sym(), from->object(), version); + bool is_ordinary; + unsigned int sec_shndx = from->shndx(&is_ordinary); + this->resolve(to, esym.sym(), sec_shndx, is_ordinary, sec_shndx, from->object(), + from->version()); if (from->in_reg()) to->set_in_reg(); if (from->in_dyn()) to->set_in_dyn(); + if (parameters->options().gc_sections()) + this->gc_mark_dyn_syms(to); +} + +// Record that a symbol is forced to be local by a version script or +// by visibility. + +void +Symbol_table::force_local(Symbol* sym) +{ + if (!sym->is_defined() && !sym->is_common()) + return; + if (sym->is_forced_local()) + { + // We already got this one. + return; + } + sym->set_is_forced_local(); + this->forced_locals_.push_back(sym); +} + +// Adjust NAME for wrapping, and update *NAME_KEY if necessary. This +// is only called for undefined symbols, when at least one --wrap +// option was used. + +const char* +Symbol_table::wrap_symbol(const char* aname, 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 (aname[0] == parameters->target().wrap_char()) + { + prefix = aname[0]; + ++aname; + } + + if (parameters->options().is_wrap(aname)) + { + // Turn NAME into __wrap_NAME. + std::string s; + if (prefix != '\0') + s += prefix; + s += "__wrap_"; + s += aname; + + // This will give us both the old and new name in NAMEPOOL_, but + // that is OK. Only the versions we need will wind up in the + // real string table in the output file. + return this->namepool_.add(s.c_str(), true, name_key); + } + + const char* const real_prefix = "__real_"; + const size_t real_prefix_length = strlen(real_prefix); + if (strncmp(aname, real_prefix, real_prefix_length) == 0 + && parameters->options().is_wrap(aname + real_prefix_length)) + { + // Turn __real_NAME into NAME. + std::string s; + if (prefix != '\0') + s += prefix; + s += aname + real_prefix_length; + return this->namepool_.add(s.c_str(), true, name_key); + } + + return aname; +} + +// This is called when we see a symbol NAME/VERSION, and the symbol +// already exists in the symbol table, and VERSION is marked as being +// the default version. SYM is the NAME/VERSION symbol we just added. +// DEFAULT_IS_NEW is true if this is the first time we have seen the +// symbol NAME/NULL. PDEF points to the entry for NAME/NULL. + +template +void +Symbol_table::define_default_version(Sized_symbol* sym, + bool default_is_new, + Symbol_table_type::iterator pdef) +{ + if (default_is_new) + { + // This is the first time we have seen NAME/NULL. Make + // NAME/NULL point to NAME/VERSION, and mark SYM as the default + // version. + pdef->second = sym; + sym->set_is_default(); + } + else if (pdef->second == sym) + { + // NAME/NULL already points to NAME/VERSION. Don't mark the + // symbol as the default if it is not already the default. + } + else + { + // This is the unfortunate case where we already have entries + // for both NAME/VERSION and NAME/NULL. We now see a symbol + // NAME/VERSION where VERSION is the default version. We have + // already resolved this new symbol with the existing + // NAME/VERSION symbol. + + // It's possible that NAME/NULL and NAME/VERSION are both + // defined in regular objects. This can only happen if one + // object file defines foo and another defines foo@@ver. This + // is somewhat obscure, but we call it a multiple definition + // error. + + // It's possible that NAME/NULL actually has a version, in which + // case it won't be the same as VERSION. This happens with + // ver_test_7.so in the testsuite for the symbol t2_2. We see + // t2_2@@VER2, so we define both t2_2/VER2 and t2_2/NULL. We + // then see an unadorned t2_2 in an object file and give it + // version VER1 from the version script. This looks like a + // default definition for VER1, so it looks like we should merge + // t2_2/NULL with t2_2/VER1. That doesn't make sense, but it's + // not obvious that this is an error, either. So we just punt. + + // If one of the symbols has non-default visibility, and the + // other is defined in a shared object, then they are different + // symbols. + + // Otherwise, we just resolve the symbols as though they were + // the same. + + if (pdef->second->version() != NULL) + gold_assert(pdef->second->version() != sym->version()); + else if (sym->visibility() != elfcpp::STV_DEFAULT + && pdef->second->is_from_dynobj()) + ; + else if (pdef->second->visibility() != elfcpp::STV_DEFAULT + && sym->is_from_dynobj()) + ; + else + { + const Sized_symbol* symdef; + symdef = this->get_sized_symbol(pdef->second); + Symbol_table::resolve(sym, symdef); + this->make_forwarder(pdef->second, sym); + pdef->second = sym; + sym->set_is_default(); + } + } } // Add one symbol from OBJECT to the symbol table. NAME is symbol // name and VERSION is the version; both are canonicalized. DEF is -// whether this is the default version. +// whether this is the default version. ST_SHNDX is the symbol's +// 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 @@ -421,22 +832,52 @@ Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from, // Note that entries in the hash table will never be marked as // forwarders. // -// SYM and ORIG_SYM are almost always the same. ORIG_SYM is the -// symbol exactly as it existed in the input file. SYM is usually -// that as well, but can be modified, for instance if we determine -// it's in a to-be-discarded section. +// ORIG_ST_SHNDX and ST_SHNDX are almost always the same. +// ORIG_ST_SHNDX is the section index in the input file, or SHN_UNDEF +// for a special section code. ST_SHNDX may be modified if the symbol +// is defined in a section being discarded. template Sized_symbol* -Symbol_table::add_from_object(Object* object, - const char *name, +Symbol_table::add_from_object(Object* aobject, + const char *aname, Stringpool::Key name_key, - const char *version, + const char *aversion, Stringpool::Key version_key, bool def, const elfcpp::Sym& sym, - const elfcpp::Sym& orig_sym) + unsigned int st_shndx, + bool is_ordinary, + unsigned int orig_st_shndx) { + // Print a message if this symbol is being traced. + if (parameters->options().is_trace_symbol(aname)) + { + if (orig_st_shndx == elfcpp::SHN_UNDEF) + gold_info(_("%s: reference to %s"), aobject->name().c_str(), aname); + else + gold_info(_("%s: definition of %s"), aobject->name().c_str(), aname); + } + + // For an undefined symbol, we may need to adjust the name using + // --wrap. + if (orig_st_shndx == elfcpp::SHN_UNDEF + && parameters->options().any_wrap()) + { + const char* wrap_name = this->wrap_symbol(aname, &name_key); + if (wrap_name != aname) + { + // If we see a reference to malloc with version GLIBC_2.0, + // and we turn it into a reference to __wrap_malloc, then we + // discard the version number. Otherwise the user would be + // required to specify the correct version for + // __wrap_malloc. + aversion = NULL; + version_key = 0; + aname = wrap_name; + } + } + Symbol* const snull = NULL; std::pair ins = this->table_.insert(std::make_pair(std::make_pair(name_key, version_key), @@ -463,69 +904,48 @@ Symbol_table::add_from_object(Object* object, if (!ins.second) { // We already have an entry for NAME/VERSION. - ret = this->get_sized_symbol SELECT_SIZE_NAME(size) (ins.first->second - SELECT_SIZE(size)); + ret = this->get_sized_symbol(ins.first->second); gold_assert(ret != NULL); was_undefined = ret->is_undefined(); was_common = ret->is_common(); - this->resolve(ret, sym, orig_sym, object, version); + this->resolve(ret, sym, st_shndx, is_ordinary, orig_st_shndx, aobject, + aversion); + if (parameters->options().gc_sections()) + this->gc_mark_dyn_syms(ret); if (def) - { - if (insdef.second) - { - // This is the first time we have seen NAME/NULL. Make - // NAME/NULL point to NAME/VERSION. - insdef.first->second = ret; - } - else if (insdef.first->second != ret - && insdef.first->second->is_undefined()) - { - // This is the unfortunate case where we already have - // entries for both NAME/VERSION and NAME/NULL. Note - // that we don't want to combine them if the existing - // symbol is going to override the new one. FIXME: We - // currently just test is_undefined, but this may not do - // the right thing if the existing symbol is from a - // shared library and the new one is from a regular - // object. - - const Sized_symbol* sym2; - sym2 = this->get_sized_symbol SELECT_SIZE_NAME(size) ( - insdef.first->second - SELECT_SIZE(size)); - Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - ret, sym2, version SELECT_SIZE_ENDIAN(size, big_endian)); - this->make_forwarder(insdef.first->second, ret); - insdef.first->second = ret; - } - } + this->define_default_version(ret, insdef.second, + insdef.first); } else { // This is the first time we have seen NAME/VERSION. gold_assert(ins.first->second == NULL); - was_undefined = false; - was_common = false; - if (def && !insdef.second) { // We already have an entry for NAME/NULL. If we override // it, then change it to NAME/VERSION. - ret = this->get_sized_symbol SELECT_SIZE_NAME(size) ( - insdef.first->second - SELECT_SIZE(size)); - this->resolve(ret, sym, orig_sym, object, version); + ret = this->get_sized_symbol(insdef.first->second); + + was_undefined = ret->is_undefined(); + was_common = ret->is_common(); + + this->resolve(ret, sym, st_shndx, is_ordinary, orig_st_shndx, aobject, + aversion); + if (parameters->options().gc_sections()) + this->gc_mark_dyn_syms(ret); ins.first->second = ret; } else { + was_undefined = false; + was_common = false; + Sized_target* target = - object->sized_target SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - SELECT_SIZE_ENDIAN_ONLY(size, big_endian)); + parameters->sized_target(); if (!target->has_make_symbol()) ret = new Sized_symbol(); else @@ -548,7 +968,7 @@ Symbol_table::add_from_object(Object* object, } } - ret->init(name, version, object, sym); + ret->init_object(aname, aversion, aobject, sym, st_shndx, is_ordinary); ins.first->second = ret; if (def) @@ -559,6 +979,9 @@ Symbol_table::add_from_object(Object* object, insdef.first->second = ret; } } + + if (def) + ret->set_is_default(); } // Record every time we see a new undefined symbol, to speed up @@ -569,7 +992,28 @@ Symbol_table::add_from_object(Object* object, // Keep track of common symbols, to speed up common symbol // allocation. if (!was_common && ret->is_common()) - this->commons_.push_back(ret); + { + if (ret->type() == elfcpp::STT_TLS) + this->tls_commons_.push_back(ret); + else if (!is_ordinary + && st_shndx == parameters->target().small_common_shndx()) + this->small_commons_.push_back(ret); + else if (!is_ordinary + && st_shndx == parameters->target().large_common_shndx()) + this->large_commons_.push_back(ret); + else + this->commons_.push_back(ret); + } + + // If we're not doing a relocatable link, then any symbol with + // hidden or internal visibility is local. + 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); return ret; } @@ -582,22 +1026,28 @@ Symbol_table::add_from_relobj( Sized_relobj* 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* sympointers) + typename Sized_relobj::Symbols* sympointers, + size_t *defined) { - gold_assert(size == relobj->target()->get_size()); - gold_assert(size == parameters->get_size()); + *defined = 0; + + gold_assert(size == parameters->target().get_size()); const int sym_size = elfcpp::Elf_sizes::sym_size; + const bool just_symbols = relobj->just_symbols(); + const unsigned char* p = syms; for (size_t i = 0; i < count; ++i, p += sym_size) { + (*sympointers)[i] = NULL; + elfcpp::Sym sym(p); - elfcpp::Sym* psym = &sym; - unsigned int st_name = psym->get_st_name(); + unsigned int st_name = sym.get_st_name(); if (st_name >= sym_name_size) { relobj->error(_("bad global symbol name offset %u at %zu"), @@ -605,61 +1055,206 @@ Symbol_table::add_from_relobj( continue; } - const char* name = sym_names + st_name; + const char* aname = sym_names + st_name; + + bool is_ordinary; + unsigned int st_shndx = relobj->adjust_sym_shndx(i + symndx_offset, + sym.get_st_shndx(), + &is_ordinary); + unsigned int orig_st_shndx = st_shndx; + if (!is_ordinary) + orig_st_shndx = elfcpp::SHN_UNDEF; + + if (st_shndx != elfcpp::SHN_UNDEF) + ++*defined; // A symbol defined in a section which we are not including must // be treated as an undefined symbol. - unsigned char symbuf[sym_size]; - elfcpp::Sym sym2(symbuf); - unsigned int st_shndx = psym->get_st_shndx(); if (st_shndx != elfcpp::SHN_UNDEF - && st_shndx < elfcpp::SHN_LORESERVE + && is_ordinary && !relobj->is_section_included(st_shndx)) - { - memcpy(symbuf, p, sym_size); - elfcpp::Sym_write sw(symbuf); - sw.put_st_shndx(elfcpp::SHN_UNDEF); - psym = &sym2; - } + st_shndx = elfcpp::SHN_UNDEF; // In an object file, an '@' in the name separates the symbol // name from the version name. If there are two '@' characters, // this is the default version. - const char* ver = strchr(name, '@'); - - Sized_symbol* res; - if (ver == NULL) - { - Stringpool::Key name_key; - name = this->namepool_.add(name, true, &name_key); - res = this->add_from_object(relobj, name, name_key, NULL, 0, - false, *psym, sym); - } - else - { - Stringpool::Key name_key; - name = this->namepool_.add_with_length(name, ver - name, true, - &name_key); - - bool def = false; - ++ver; + const char* ver = strchr(aname, '@'); + 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; + + if (ver != NULL) + { + // The symbol name is of the form foo@VERSION or foo@@VERSION + namelen = ver - aname; + ++ver; if (*ver == '@') { def = true; ++ver; } - - Stringpool::Key ver_key; ver = this->namepool_.add(ver, true, &ver_key); + } + // We don't want to assign a version to an undefined symbol, + // even if it is listed in the version script. FIXME: What + // about a common symbol? + else + { + namelen = strlen(aname); + if (!this->version_script_.empty() + && st_shndx != elfcpp::SHN_UNDEF) + { + // The symbol name did not have a version, but the + // version script may assign a version anyway. + std::string aversion; + if (this->version_script_.get_symbol_version(aname, &aversion)) + { + // The version can be empty if the version script is + // only used to force some symbols to be local. + if (!aversion.empty()) + { + ver = this->namepool_.add_with_length(aversion.c_str(), + aversion.length(), + true, + &ver_key); + def = true; + } + } + else if (this->version_script_.symbol_is_local(aname)) + local = true; + } + } - res = this->add_from_object(relobj, name, name_key, ver, ver_key, - def, *psym, sym); + elfcpp::Sym* psym = &sym; + unsigned char symbuf[sym_size]; + elfcpp::Sym sym2(symbuf); + if (just_symbols) + { + memcpy(symbuf, p, sym_size); + elfcpp::Sym_write sw(symbuf); + if (orig_st_shndx != elfcpp::SHN_UNDEF && is_ordinary) + { + // Symbol values in object files are section relative. + // This is normally what we want, but since here we are + // converting the symbol to absolute we need to add the + // section address. The section address in an object + // file is normally zero, but people can use a linker + // script to change it. + sw.put_st_value(sym.get_st_value() + + relobj->section_address(orig_st_shndx)); + } + st_shndx = elfcpp::SHN_ABS; + is_ordinary = false; + psym = &sym2; } + // Fix up visibility if object has no-export set. + if (relobj->no_export()) + { + // We may have copied symbol already above. + if (psym != &sym2) + { + memcpy(symbuf, p, sym_size); + psym = &sym2; + } + + elfcpp::STV visibility = sym2.get_st_visibility(); + if (visibility == elfcpp::STV_DEFAULT + || visibility == elfcpp::STV_PROTECTED) + { + elfcpp::Sym_write sw(symbuf); + unsigned char nonvis = sym2.get_st_nonvis(); + sw.put_st_other(elfcpp::STV_HIDDEN, nonvis); + } + } + + Stringpool::Key name_key; + aname = this->namepool_.add_with_length(aname, namelen, true, + &name_key); + + Sized_symbol* res; + res = this->add_from_object(relobj, aname, name_key, ver, ver_key, + def, *psym, st_shndx, is_ordinary, + orig_st_shndx); + + // If building a shared library using garbage collection, do not + // treat externally visible symbols as garbage. + if (parameters->options().gc_sections() + && parameters->options().shared()) + this->gc_mark_symbol_for_shlib(res); + + if (local) + this->force_local(res); + (*sympointers)[i] = res; } } +// Add a symbol from a plugin-claimed file. + +template +Symbol* +Symbol_table::add_from_pluginobj( + Sized_pluginobj* obj, + const char* aname, + const char* ver, + 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; + + if (ver != NULL) + { + ver = this->namepool_.add(ver, true, &ver_key); + } + // We don't want to assign a version to an undefined symbol, + // even if it is listed in the version script. FIXME: What + // about a common symbol? + else + { + if (!this->version_script_.empty() + && st_shndx != elfcpp::SHN_UNDEF) + { + // The symbol name did not have a version, but the + // version script may assign a version anyway. + std::string aversion; + if (this->version_script_.get_symbol_version(aname, &aversion)) + { + // The version can be empty if the version script is + // only used to force some symbols to be local. + if (!aversion.empty()) + { + ver = this->namepool_.add_with_length(aversion.c_str(), + aversion.length(), + true, + &ver_key); + def = true; + } + } + else if (this->version_script_.symbol_is_local(aname)) + local = true; + } + } + + Stringpool::Key name_key; + aname = this->namepool_.add(aname, true, &name_key); + + Sized_symbol* res; + res = this->add_from_object(obj, aname, name_key, ver, ver_key, + def, *sym, st_shndx, is_ordinary, st_shndx); + + if (local) + this->force_local(res); + + return res; +} + // Add all the symbols in a dynamic object to the hash table. template @@ -672,10 +1267,19 @@ Symbol_table::add_from_dynobj( size_t sym_name_size, const unsigned char* versym, size_t versym_size, - const std::vector* version_map) + const std::vector* version_map, + typename Sized_relobj::Symbols* sympointers, + size_t* defined) { - gold_assert(size == dynobj->target()->get_size()); - gold_assert(size == parameters->get_size()); + *defined = 0; + + gold_assert(size == parameters->target().get_size()); + + if (dynobj->just_symbols()) + { + gold_error(_("--just-symbols does not make sense with a shared object")); + return; + } if (versym != NULL && versym_size / 2 < count) { @@ -701,11 +1305,31 @@ Symbol_table::add_from_dynobj( { elfcpp::Sym sym(p); - // Ignore symbols with local binding. - if (sym.get_st_bind() == elfcpp::STB_LOCAL) + if (sympointers != NULL) + (*sympointers)[i] = NULL; + + // Ignore symbols with local binding or that have + // internal or hidden visibility. + if (sym.get_st_bind() == elfcpp::STB_LOCAL + || sym.get_st_visibility() == elfcpp::STV_INTERNAL + || sym.get_st_visibility() == elfcpp::STV_HIDDEN) continue; - unsigned int st_name = sym.get_st_name(); + // A protected symbol in a shared library must be treated as a + // normal symbol when viewed from outside the shared library. + // Implement this by overriding the visibility here. + elfcpp::Sym* psym = &sym; + unsigned char symbuf[sym_size]; + elfcpp::Sym sym2(symbuf); + if (sym.get_st_visibility() == elfcpp::STV_PROTECTED) + { + memcpy(symbuf, p, sym_size); + elfcpp::Sym_write sw(symbuf); + sw.put_st_other(elfcpp::STV_DEFAULT, sym.get_st_nonvis()); + psym = &sym2; + } + + unsigned int st_name = psym->get_st_name(); if (st_name >= sym_name_size) { dynobj->error(_("bad symbol name offset %u at %zu"), @@ -713,16 +1337,24 @@ Symbol_table::add_from_dynobj( continue; } - const char* name = sym_names + st_name; + const char* aname = sym_names + st_name; + + bool is_ordinary; + unsigned int st_shndx = dynobj->adjust_sym_shndx(i, psym->get_st_shndx(), + &is_ordinary); + + if (st_shndx != elfcpp::SHN_UNDEF) + ++*defined; Sized_symbol* res; if (versym == NULL) { Stringpool::Key name_key; - name = this->namepool_.add(name, true, &name_key); - res = this->add_from_object(dynobj, name, name_key, NULL, 0, - false, sym, sym); + aname = this->namepool_.add(aname, true, &name_key); + res = this->add_from_object(dynobj, aname, name_key, NULL, 0, + false, *psym, st_shndx, is_ordinary, + st_shndx); } else { @@ -741,7 +1373,7 @@ Symbol_table::add_from_dynobj( // linker will generate. if (v == static_cast(elfcpp::VER_NDX_LOCAL) - && sym.get_st_shndx() != elfcpp::SHN_UNDEF) + && st_shndx != elfcpp::SHN_UNDEF) { // This symbol should not be visible outside the object. continue; @@ -749,14 +1381,15 @@ Symbol_table::add_from_dynobj( // At this point we are definitely going to add this symbol. Stringpool::Key name_key; - name = this->namepool_.add(name, true, &name_key); + aname = this->namepool_.add(aname, true, &name_key); if (v == static_cast(elfcpp::VER_NDX_LOCAL) || v == static_cast(elfcpp::VER_NDX_GLOBAL)) { // This symbol does not have a version. - res = this->add_from_object(dynobj, name, name_key, NULL, 0, - false, sym, sym); + res = this->add_from_object(dynobj, aname, name_key, NULL, 0, + false, *psym, st_shndx, is_ordinary, + st_shndx); } else { @@ -767,8 +1400,8 @@ Symbol_table::add_from_dynobj( continue; } - const char* version = (*version_map)[v]; - if (version == NULL) + const char* aversion = (*version_map)[v]; + if (aversion == NULL) { dynobj->error(_("versym for symbol %zu has no name: %u"), i, v); @@ -776,31 +1409,41 @@ Symbol_table::add_from_dynobj( } Stringpool::Key version_key; - version = this->namepool_.add(version, true, &version_key); + aversion = this->namepool_.add(aversion, true, &version_key); // If this is an absolute symbol, and the version name // and symbol name are the same, then this is the // version definition symbol. These symbols exist to // support using -u to pull in particular versions. We // do not want to record a version for them. - if (sym.get_st_shndx() == elfcpp::SHN_ABS + if (st_shndx == elfcpp::SHN_ABS + && !is_ordinary && name_key == version_key) - res = this->add_from_object(dynobj, name, name_key, NULL, 0, - false, sym, sym); + res = this->add_from_object(dynobj, aname, name_key, NULL, 0, + false, *psym, st_shndx, is_ordinary, + st_shndx); else { const bool def = (!hidden - && (sym.get_st_shndx() - != elfcpp::SHN_UNDEF)); - res = this->add_from_object(dynobj, name, name_key, version, - version_key, def, sym, sym); + && st_shndx != elfcpp::SHN_UNDEF); + res = this->add_from_object(dynobj, aname, name_key, aversion, + version_key, def, *psym, st_shndx, + is_ordinary, st_shndx); } } } - if (sym.get_st_shndx() != elfcpp::SHN_UNDEF - && sym.get_st_type() == elfcpp::STT_OBJECT) + // Note that it is possible that RES was overridden by an + // earlier object, in which case it can't be aliased here. + if (st_shndx != elfcpp::SHN_UNDEF + && is_ordinary + && psym->get_st_type() == elfcpp::STT_OBJECT + && res->source() == Symbol::FROM_OBJECT + && res->object() == dynobj) object_symbols.push_back(res); + + if (sympointers != NULL) + (*sympointers)[i] = res; } this->record_weak_aliases(&object_symbols); @@ -821,8 +1464,14 @@ bool Weak_alias_sorter::operator()(const Sized_symbol* s1, const Sized_symbol* s2) const { - if (s1->shndx() != s2->shndx()) - return s1->shndx() < s2->shndx(); + bool is_ordinary; + unsigned int s1_shndx = s1->shndx(&is_ordinary); + gold_assert(is_ordinary); + unsigned int s2_shndx = s2->shndx(&is_ordinary); + gold_assert(is_ordinary); + if (s1_shndx != s2_shndx) + return s1_shndx < s2_shndx; + if (s1->value() != s2->value()) return s1->value() < s2->value(); if (s1->binding() != s2->binding()) @@ -865,7 +1514,8 @@ Symbol_table::record_weak_aliases(std::vector*>* symbols) typename std::vector*>::const_iterator q; for (q = p + 1; q != symbols->end(); ++q) { - if ((*q)->shndx() != from_sym->shndx() + bool dummy; + if ((*q)->shndx(&dummy) != from_sym->shndx(&dummy) || (*q)->value() != from_sym->value()) break; @@ -887,28 +1537,55 @@ Symbol_table::record_weak_aliases(std::vector*>* symbols) // Create and return a specially defined symbol. If ONLY_IF_REF is // true, then only create the symbol if there is a reference to it. // If this does not return NULL, it sets *POLDSYM to the existing -// symbol if there is one. This canonicalizes *PNAME and *PVERSION. +// symbol if there is one. This sets *RESOLVE_OLDSYM if we should +// resolve the newly created symbol to the old one. This +// canonicalizes *PNAME and *PVERSION. template Sized_symbol* -Symbol_table::define_special_symbol(const Target* target, const char** pname, - const char** pversion, bool only_if_ref, - Sized_symbol** poldsym - ACCEPT_SIZE_ENDIAN) +Symbol_table::define_special_symbol(const char** pname, const char** pversion, + bool only_if_ref, + Sized_symbol** poldsym, + bool *resolve_oldsym) { + *resolve_oldsym = false; + + // If the caller didn't give us a version, see if we get one from + // the version script. + std::string v; + bool is_default_version = false; + if (*pversion == NULL) + { + if (this->version_script_.get_symbol_version(*pname, &v)) + { + 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; + } + } + Symbol* oldsym; Sized_symbol* sym; + bool add_to_table = false; typename Symbol_table_type::iterator add_loc = this->table_.end(); + bool add_def_to_table = false; + typename Symbol_table_type::iterator add_def_loc = this->table_.end(); if (only_if_ref) { oldsym = this->lookup(*pname, *pversion); + if (oldsym == NULL && is_default_version) + oldsym = this->lookup(*pname, NULL); if (oldsym == NULL || !oldsym->is_undefined()) return NULL; *pname = oldsym->name(); - *pversion = oldsym->version(); + if (!is_default_version) + *pversion = oldsym->version(); } else { @@ -926,31 +1603,66 @@ Symbol_table::define_special_symbol(const Target* target, const char** pname, version_key), snull)); + std::pair insdef = + 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)); + } + if (!ins.second) { // We already have a symbol table entry for NAME/VERSION. oldsym = ins.first->second; gold_assert(oldsym != NULL); + + if (is_default_version) + { + Sized_symbol* soldsym = + this->get_sized_symbol(oldsym); + this->define_default_version(soldsym, + insdef.second, + insdef.first); + } } else { // We haven't seen this symbol before. gold_assert(ins.first->second == NULL); - add_to_table = true; - add_loc = ins.first; - oldsym = NULL; + + add_to_table = true; + add_loc = ins.first; + + if (is_default_version && !insdef.second) + { + // We are adding NAME/VERSION, and it is the default + // version. We already have an entry for NAME/NULL. + oldsym = insdef.first->second; + *resolve_oldsym = true; + } + else + { + oldsym = NULL; + + if (is_default_version) + { + add_def_to_table = true; + add_def_loc = insdef.first; + } + } } } - if (!target->has_make_symbol()) + const Target& target = parameters->target(); + if (!target.has_make_symbol()) 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; @@ -961,8 +1673,10 @@ Symbol_table::define_special_symbol(const Target* target, const char** pname, else gold_assert(oldsym != NULL); - *poldsym = this->get_sized_symbol SELECT_SIZE_NAME(size) (oldsym - SELECT_SIZE(size)); + if (add_def_to_table) + add_def_loc->second = sym; + + *poldsym = this->get_sized_symbol(oldsym); return sym; } @@ -970,34 +1684,37 @@ Symbol_table::define_special_symbol(const Target* target, const char** pname, // Define a symbol based on an Output_data. Symbol* -Symbol_table::define_in_output_data(const Target* target, const char* name, - const char* version, Output_data* od, - uint64_t value, uint64_t symsize, - elfcpp::STT type, elfcpp::STB binding, +Symbol_table::define_in_output_data(const char* aname, + const char* aversion, + Output_data* od, + uint64_t avalue, + uint64_t sym_size, + elfcpp::STT type, + elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - bool offset_is_from_end, + bool offset_is_from_the_end, bool only_if_ref) { - if (parameters->get_size() == 32) + 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>(target, name, version, od, - value, symsize, type, binding, + return this->do_define_in_output_data<32>(aname, aversion, od, + avalue, sym_size, type, binding, visibility, nonvis, - offset_is_from_end, + offset_is_from_the_end, only_if_ref); #else gold_unreachable(); #endif } - else if (parameters->get_size() == 64) + 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>(target, name, version, od, - value, symsize, type, binding, + return this->do_define_in_output_data<64>(aname, aversion, od, + avalue, sym_size, type, binding, visibility, nonvis, - offset_is_from_end, + offset_is_from_the_end, only_if_ref); #else gold_unreachable(); @@ -1012,28 +1729,28 @@ Symbol_table::define_in_output_data(const Target* target, const char* name, template Sized_symbol* Symbol_table::do_define_in_output_data( - const Target* target, - const char* name, - const char* version, + const char* aname, + const char* aversion, Output_data* od, - typename elfcpp::Elf_types::Elf_Addr value, - typename elfcpp::Elf_types::Elf_WXword symsize, + typename elfcpp::Elf_types::Elf_Addr avalue, + typename elfcpp::Elf_types::Elf_WXword sym_size, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - bool offset_is_from_end, + bool offset_is_from_the_end, bool only_if_ref) { Sized_symbol* sym; Sized_symbol* oldsym; + bool resolve_oldsym; - if (parameters->is_big_endian()) + if (parameters->target().is_big_endian()) { #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, true)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1041,9 +1758,9 @@ Symbol_table::do_define_in_output_data( else { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, false)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1052,47 +1769,63 @@ Symbol_table::do_define_in_output_data( if (sym == NULL) return NULL; - gold_assert(version == NULL || oldsym != NULL); - sym->init(name, od, value, symsize, type, binding, visibility, nonvis, - offset_is_from_end); + sym->init_output_data(aname, aversion, od, avalue, sym_size, type, binding, + visibility, nonvis, offset_is_from_the_end); + + if (oldsym == NULL) + { + if (binding == elfcpp::STB_LOCAL + || this->version_script_.symbol_is_local(aname)) + this->force_local(sym); + else if (aversion != NULL) + sym->set_is_default(); + return sym; + } - if (oldsym != NULL - && Symbol_table::should_override_with_special(oldsym)) + if (Symbol_table::should_override_with_special(oldsym)) this->override_with_special(oldsym, sym); - return sym; + if (resolve_oldsym) + return sym; + else + { + delete sym; + return oldsym; + } } // Define a symbol based on an Output_segment. Symbol* -Symbol_table::define_in_output_segment(const Target* target, const char* name, - const char* version, Output_segment* os, - uint64_t value, uint64_t symsize, - elfcpp::STT type, elfcpp::STB binding, +Symbol_table::define_in_output_segment(const char* aname, + const char* aversion, Output_segment* os, + uint64_t avalue, + uint64_t sym_size, + elfcpp::STT type, + elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - Symbol::Segment_offset_base offset_base, + Symbol::Segment_offset_base offsetbase, bool only_if_ref) { - if (parameters->get_size() == 32) + 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>(target, name, version, os, - value, symsize, type, + return this->do_define_in_output_segment<32>(aname, aversion, os, + avalue, sym_size, type, binding, visibility, nonvis, - offset_base, only_if_ref); + offsetbase, only_if_ref); #else gold_unreachable(); #endif } - else if (parameters->get_size() == 64) + 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>(target, name, version, os, - value, symsize, type, + return this->do_define_in_output_segment<64>(aname, aversion, os, + avalue, sym_size, type, binding, visibility, nonvis, - offset_base, only_if_ref); + offsetbase, only_if_ref); #else gold_unreachable(); #endif @@ -1106,28 +1839,28 @@ Symbol_table::define_in_output_segment(const Target* target, const char* name, template Sized_symbol* Symbol_table::do_define_in_output_segment( - const Target* target, - const char* name, - const char* version, + const char* aname, + const char* aversion, Output_segment* os, - typename elfcpp::Elf_types::Elf_Addr value, - typename elfcpp::Elf_types::Elf_WXword symsize, + typename elfcpp::Elf_types::Elf_Addr avalue, + typename elfcpp::Elf_types::Elf_WXword sym_size, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - Symbol::Segment_offset_base offset_base, + Symbol::Segment_offset_base offsetbase, bool only_if_ref) { Sized_symbol* sym; Sized_symbol* oldsym; + bool resolve_oldsym; - if (parameters->is_big_endian()) + if (parameters->target().is_big_endian()) { #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, true)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1135,9 +1868,9 @@ Symbol_table::do_define_in_output_segment( else { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, false)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1146,43 +1879,64 @@ Symbol_table::do_define_in_output_segment( if (sym == NULL) return NULL; - gold_assert(version == NULL || oldsym != NULL); - sym->init(name, os, value, symsize, type, binding, visibility, nonvis, - offset_base); + sym->init_output_segment(aname, aversion, os, avalue, sym_size, type, binding, + visibility, nonvis, offsetbase); + + if (oldsym == NULL) + { + if (binding == elfcpp::STB_LOCAL + || this->version_script_.symbol_is_local(aname)) + this->force_local(sym); + else if (aversion != NULL) + sym->set_is_default(); + return sym; + } - if (oldsym != NULL - && Symbol_table::should_override_with_special(oldsym)) + if (Symbol_table::should_override_with_special(oldsym)) this->override_with_special(oldsym, sym); - return sym; + if (resolve_oldsym) + return sym; + else + { + delete sym; + return oldsym; + } } // Define a special symbol with a constant value. It is a multiple // definition error if this symbol is already defined. Symbol* -Symbol_table::define_as_constant(const Target* target, const char* name, - const char* version, uint64_t value, - uint64_t symsize, elfcpp::STT type, - elfcpp::STB binding, elfcpp::STV visibility, - unsigned char nonvis, bool only_if_ref) +Symbol_table::define_as_constant(const char* aname, + const char* aversion, + uint64_t avalue, + uint64_t sym_size, + elfcpp::STT type, + elfcpp::STB binding, + elfcpp::STV visibility, + unsigned char nonvis, + bool only_if_ref, + bool force_override) { - if (parameters->get_size() == 32) + if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) - return this->do_define_as_constant<32>(target, name, version, value, - symsize, type, binding, - visibility, nonvis, only_if_ref); + return this->do_define_as_constant<32>(aname, aversion, avalue, + sym_size, type, binding, + visibility, nonvis, only_if_ref, + force_override); #else gold_unreachable(); #endif } - else if (parameters->get_size() == 64) + 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>(target, name, version, value, - symsize, type, binding, - visibility, nonvis, only_if_ref); + return this->do_define_as_constant<64>(aname, aversion, avalue, + sym_size, type, binding, + visibility, nonvis, only_if_ref, + force_override); #else gold_unreachable(); #endif @@ -1196,26 +1950,27 @@ Symbol_table::define_as_constant(const Target* target, const char* name, template Sized_symbol* Symbol_table::do_define_as_constant( - const Target* target, - const char* name, - const char* version, - typename elfcpp::Elf_types::Elf_Addr value, - typename elfcpp::Elf_types::Elf_WXword symsize, + const char* aname, + const char* aversion, + typename elfcpp::Elf_types::Elf_Addr avalue, + typename elfcpp::Elf_types::Elf_WXword sym_size, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, unsigned char nonvis, - bool only_if_ref) + bool only_if_ref, + bool force_override) { Sized_symbol* sym; Sized_symbol* oldsym; + bool resolve_oldsym; - if (parameters->is_big_endian()) + if (parameters->target().is_big_endian()) { #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, true)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1223,9 +1978,9 @@ Symbol_table::do_define_as_constant( else { #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE) - sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, &name, &version, only_if_ref, &oldsym - SELECT_SIZE_ENDIAN(size, false)); + sym = this->define_special_symbol(&aname, &aversion, + only_if_ref, &oldsym, + &resolve_oldsym); #else gold_unreachable(); #endif @@ -1234,42 +1989,67 @@ Symbol_table::do_define_as_constant( if (sym == NULL) return NULL; - gold_assert(version == NULL || oldsym != NULL); - sym->init(name, value, symsize, type, binding, visibility, nonvis); + sym->init_constant(aname, aversion, avalue, sym_size, type, binding, visibility, + nonvis); + + if (oldsym == NULL) + { + // Version symbols are absolute symbols with name == version. + // We don't want to force them to be local. + if ((aversion == NULL + || aname != aversion + || avalue != 0) + && (binding == elfcpp::STB_LOCAL + || this->version_script_.symbol_is_local(aname))) + this->force_local(sym); + else if (aversion != NULL + && (aname != aversion || avalue != 0)) + sym->set_is_default(); + return sym; + } - if (oldsym != NULL - && Symbol_table::should_override_with_special(oldsym)) + if (force_override || Symbol_table::should_override_with_special(oldsym)) this->override_with_special(oldsym, sym); - return sym; + if (resolve_oldsym) + return sym; + else + { + delete sym; + return oldsym; + } } // Define a set of symbols in output sections. void -Symbol_table::define_symbols(const Layout* layout, const Target* target, - int count, const Define_symbol_in_section* p) +Symbol_table::define_symbols(const Layout* layout, int count, + const Define_symbol_in_section* p, + bool only_if_ref) { for (int i = 0; i < count; ++i, ++p) { Output_section* os = layout->find_output_section(p->output_section); if (os != NULL) - this->define_in_output_data(target, p->name, NULL, os, p->value, + this->define_in_output_data(p->name, NULL, os, p->value, p->size, p->type, p->binding, p->visibility, p->nonvis, - p->offset_is_from_end, p->only_if_ref); + p->offset_is_from_end, + only_if_ref || p->only_if_ref); else - this->define_as_constant(target, p->name, NULL, 0, p->size, p->type, + this->define_as_constant(p->name, NULL, 0, p->size, p->type, p->binding, p->visibility, p->nonvis, - p->only_if_ref); + only_if_ref || p->only_if_ref, + false); } } // Define a set of symbols in output segments. void -Symbol_table::define_symbols(const Layout* layout, const Target* target, - int count, const Define_symbol_in_segment* p) +Symbol_table::define_symbols(const Layout* layout, int count, + const Define_symbol_in_segment* p, + bool only_if_ref) { for (int i = 0; i < count; ++i, ++p) { @@ -1277,14 +2057,16 @@ Symbol_table::define_symbols(const Layout* layout, const Target* target, p->segment_flags_set, p->segment_flags_clear); if (os != NULL) - this->define_in_output_segment(target, p->name, NULL, os, p->value, + this->define_in_output_segment(p->name, NULL, os, p->value, p->size, p->type, p->binding, p->visibility, p->nonvis, - p->offset_base, p->only_if_ref); + p->offset_base, + only_if_ref || p->only_if_ref); else - this->define_as_constant(target, p->name, NULL, 0, p->size, p->type, + this->define_as_constant(p->name, NULL, 0, p->size, p->type, p->binding, p->visibility, p->nonvis, - p->only_if_ref); + only_if_ref || p->only_if_ref, + false); } } @@ -1295,16 +2077,15 @@ Symbol_table::define_symbols(const Layout* layout, const Target* target, template void Symbol_table::define_with_copy_reloc( - const Target* target, Sized_symbol* csym, Output_data* posd, - typename elfcpp::Elf_types::Elf_Addr value) + typename elfcpp::Elf_types::Elf_Addr avalue) { gold_assert(csym->is_from_dynobj()); gold_assert(!csym->is_copied_from_dynobj()); - Object* object = csym->object(); - gold_assert(object->is_dynamic()); - Dynobj* dynobj = static_cast(object); + Object* aobject = csym->object(); + gold_assert(aobject->is_dynamic()); + Dynobj* dynobj = static_cast(aobject); // Our copied variable has to override any variable in a shared // library. @@ -1312,8 +2093,8 @@ Symbol_table::define_with_copy_reloc( if (binding == elfcpp::STB_WEAK) binding = elfcpp::STB_GLOBAL; - this->define_in_output_data(target, csym->name(), csym->version(), - posd, value, csym->symsize(), + this->define_in_output_data(csym->name(), csym->version(), + posd, avalue, csym->symsize(), csym->type(), binding, csym->visibility(), csym->nonvis(), false, false); @@ -1354,14 +2135,89 @@ Symbol_table::get_copy_source(const Symbol* sym) const return p->second; } +// Add any undefined symbols named on the command line. + +void +Symbol_table::add_undefined_symbols_from_command_line() +{ + if (parameters->options().any_undefined()) + { + 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>(); +#else + gold_unreachable(); +#endif + } + 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>(); +#else + gold_unreachable(); +#endif + } + else + gold_unreachable(); + } +} + +template +void +Symbol_table::do_add_undefined_symbols_from_command_line() +{ + for (options::String_set::const_iterator p = + parameters->options().undefined_begin(); + p != parameters->options().undefined_end(); + ++p) + { + const char* aname = p->c_str(); + + if (this->lookup(aname) != NULL) + continue; + + const char* aversion = 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(&aname, &aversion, + false, &oldsym, + &resolve_oldsym); +#else + gold_unreachable(); +#endif + } + else + { +#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE) + sym = this->define_special_symbol(&aname, &aversion, + false, &oldsym, + &resolve_oldsym); +#else + gold_unreachable(); +#endif + } + + gold_assert(oldsym == NULL); + + sym->init_undefined(aname, aversion, 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 // global dynamic symbol. Pointers to the symbols are stored into the // vector SYMS. The names are added to DYNPOOL. This returns an // updated dynamic symbol index. unsigned int -Symbol_table::set_dynsym_indexes(const Target* target, - unsigned int index, +Symbol_table::set_dynsym_indexes(unsigned int index, std::vector* syms, Stringpool* dynpool, Versions* versions) @@ -1386,48 +2242,55 @@ Symbol_table::set_dynsym_indexes(const Target* target, dynpool->add(sym->name(), false, NULL); // Record any version information. - if (sym->version() != NULL) - versions->record_version(this, dynpool, sym); + 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(); } } // Finish up the versions. In some cases this may add new dynamic // symbols. - index = versions->finalize(target, this, index, syms); + index = versions->finalize(this, index, syms); return index; } // Set the final values for all the symbols. The index of the first -// global symbol in the output file is INDEX. Record the file offset -// OFF. Add their names to POOL. Return the new file offset. +// global symbol in the output file is *PLOCAL_SYMCOUNT. Record the +// file offset OFF. Add their names to POOL. Return the new file +// offset. Update *PLOCAL_SYMCOUNT if necessary. off_t -Symbol_table::finalize(const Task* task, unsigned int index, off_t off, - off_t dynoff, size_t dyn_global_index, size_t dyncount, - Stringpool* pool) +Symbol_table::finalize(off_t off, off_t dynoff, size_t dyn_global_index, + size_t dyncount, Stringpool* pool, + unsigned int *plocal_symcount) { off_t ret; - gold_assert(index != 0); - this->first_global_index_ = index; + gold_assert(*plocal_symcount != 0); + this->first_global_index_ = *plocal_symcount; this->dynamic_offset_ = dynoff; this->first_dynamic_global_index_ = dyn_global_index; this->dynamic_count_ = dyncount; - if (parameters->get_size() == 32) + if (parameters->target().get_size() == 32) { #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_32_LITTLE) - ret = this->sized_finalize<32>(index, off, pool); + ret = this->sized_finalize<32>(off, pool, plocal_symcount); #else gold_unreachable(); #endif } - else if (parameters->get_size() == 64) + else if (parameters->target().get_size() == 64) { #if defined(HAVE_TARGET_64_BIG) || defined(HAVE_TARGET_64_LITTLE) - ret = this->sized_finalize<64>(index, off, pool); + ret = this->sized_finalize<64>(off, pool, plocal_symcount); #else gold_unreachable(); #endif @@ -1437,229 +2300,350 @@ Symbol_table::finalize(const Task* task, unsigned int index, off_t off, // Now that we have the final symbol table, we can reliably note // which symbols should get warnings. - this->warnings_.note_warnings(this, task); + this->warnings_.note_warnings(this); return ret; } +// SYM is going into the symbol table at *PINDEX. Add the name to +// POOL, update *PINDEX and *POFF. + +template +void +Symbol_table::add_to_final_symtab(Symbol* sym, Stringpool* pool, + unsigned int* pindex, off_t* poff) +{ + sym->set_symtab_index(*pindex); + pool->add(sym->name(), false, NULL); + ++*pindex; + *poff += elfcpp::Elf_sizes::sym_size; +} + // Set the final value for all the symbols. This is called after // Layout::finalize, so all the output sections have their final // address. template off_t -Symbol_table::sized_finalize(unsigned index, off_t off, Stringpool* pool) +Symbol_table::sized_finalize(off_t off, Stringpool* pool, + unsigned int* plocal_symcount) { off = align_address(off, size >> 3); this->offset_ = off; - size_t orig_index = index; + unsigned int index = *plocal_symcount; + const unsigned int orig_index = index; - const int sym_size = elfcpp::Elf_sizes::sym_size; + // First do all the symbols which have been forced to be local, as + // they must appear before all global symbols. + for (Forced_locals::iterator p = this->forced_locals_.begin(); + p != this->forced_locals_.end(); + ++p) + { + Symbol* sym = *p; + gold_assert(sym->is_forced_local()); + if (this->sized_finalize_symbol(sym)) + { + this->add_to_final_symtab(sym, pool, &index, &off); + ++*plocal_symcount; + } + } + + // Now do all the remaining symbols. for (Symbol_table_type::iterator p = this->table_.begin(); p != this->table_.end(); ++p) { - Sized_symbol* sym = static_cast*>(p->second); + Symbol* sym = p->second; + if (this->sized_finalize_symbol(sym)) + this->add_to_final_symtab(sym, pool, &index, &off); + } - // FIXME: Here we need to decide which symbols should go into - // the output file, based on --strip. + this->output_count_ = index - orig_index; - // 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()) - continue; + return off; +} - if (!sym->in_reg()) - { - gold_assert(!sym->has_symtab_index()); - sym->set_symtab_index(-1U); - gold_assert(sym->dynsym_index() == -1U); - continue; - } +// 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. - typename Sized_symbol::Value_type value; +template +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; + Value_type avalue; - switch (sym->source()) - { - case Symbol::FROM_OBJECT: + switch (sym->source()) + { + case Symbol::FROM_OBJECT: + { + bool is_ordinary; + unsigned int sec_shndx = sym->shndx(&is_ordinary); + + if (!is_ordinary + && sec_shndx != elfcpp::SHN_ABS + && !Symbol::is_common_shndx(sec_shndx)) { - unsigned int shndx = sym->shndx(); + *pstatus = CFVS_UNSUPPORTED_SYMBOL_SECTION; + return 0; + } - // FIXME: We need some target specific support here. - if (shndx >= elfcpp::SHN_LORESERVE - && shndx != elfcpp::SHN_ABS) + Object* symobj = sym->object(); + if (symobj->is_dynamic()) + { + avalue = 0; + sec_shndx = elfcpp::SHN_UNDEF; + } + else if (symobj->pluginobj() != NULL) + { + avalue = 0; + sec_shndx = elfcpp::SHN_UNDEF; + } + else if (sec_shndx == elfcpp::SHN_UNDEF) + avalue = 0; + else if (!is_ordinary + && (sec_shndx == elfcpp::SHN_ABS + || Symbol::is_common_shndx(sec_shndx))) + avalue = sym->value(); + else + { + Relobj* relobj = static_cast(symobj); + Output_section* os = relobj->output_section(sec_shndx); + uint64_t secoff64 = relobj->output_section_offset(sec_shndx); + + if (this->is_section_folded(relobj, sec_shndx)) + { + gold_assert(os == NULL); + // Get the os of the section it is folded onto. + Section_id folded = this->icf_->get_folded_section(relobj, + sec_shndx); + gold_assert(folded.first != NULL); + Relobj* folded_obj = reinterpret_cast(folded.first); + os = folded_obj->output_section(folded.second); + gold_assert(os != NULL); + secoff64 = folded_obj->output_section_offset(folded.second); + } + + if (os == NULL) { - gold_error(_("%s: unsupported symbol section 0x%x"), - sym->demangled_name().c_str(), shndx); - shndx = elfcpp::SHN_UNDEF; - } + bool static_or_reloc = (parameters->doing_static_link() || + parameters->options().relocatable()); + gold_assert(static_or_reloc || sym->dynsym_index() == -1U); - Object* symobj = sym->object(); - if (symobj->is_dynamic()) - { - value = 0; - shndx = elfcpp::SHN_UNDEF; + *pstatus = CFVS_NO_OUTPUT_SECTION; + return 0; } - else if (shndx == elfcpp::SHN_UNDEF) - value = 0; - else if (shndx == elfcpp::SHN_ABS) - value = sym->value(); - else - { - Relobj* relobj = static_cast(symobj); - section_offset_type secoff; - Output_section* os = relobj->output_section(shndx, &secoff); - if (os == NULL) - { - sym->set_symtab_index(-1U); - gold_assert(sym->dynsym_index() == -1U); - continue; - } + if (secoff64 == -1ULL) + { + // The section needs special handling (e.g., a merge section). - if (sym->type() == elfcpp::STT_TLS) - value = sym->value() + os->tls_offset() + secoff; - else - value = sym->value() + os->address() + secoff; + avalue = os->output_address(relobj, sec_shndx, sym->value()); + } + else + { + Value_type secoff = + convert_types(secoff64); + if (sym->type() == elfcpp::STT_TLS) + avalue = sym->value() + os->tls_offset() + secoff; + else + avalue = sym->value() + os->address() + secoff; } } - break; - - case Symbol::IN_OUTPUT_DATA: + } + break; + + case Symbol::IN_OUTPUT_DATA: + { + Output_data* od = sym->output_data(); + avalue = sym->value(); + if (sym->type() != elfcpp::STT_TLS) + avalue += od->address(); + else { - Output_data* od = sym->output_data(); - value = sym->value() + od->address(); - if (sym->offset_is_from_end()) - value += od->data_size(); + Output_section* os = od->output_section(); + gold_assert(os != NULL); + avalue += os->tls_offset() + (od->address() - os->address()); } - break; - - case Symbol::IN_OUTPUT_SEGMENT: + if (sym->offset_is_from_end()) + avalue += od->data_size(); + } + break; + + case Symbol::IN_OUTPUT_SEGMENT: + { + Output_segment* os = sym->output_segment(); + avalue = sym->value(); + if (sym->type() != elfcpp::STT_TLS) + avalue += os->vaddr(); + switch (sym->offset_base()) { - Output_segment* os = sym->output_segment(); - value = sym->value() + os->vaddr(); - switch (sym->offset_base()) - { - case Symbol::SEGMENT_START: - break; - case Symbol::SEGMENT_END: - value += os->memsz(); - break; - case Symbol::SEGMENT_BSS: - value += os->filesz(); - break; - default: - gold_unreachable(); - } + case Symbol::SEGMENT_START: + break; + case Symbol::SEGMENT_END: + avalue += os->memsz(); + break; + case Symbol::SEGMENT_BSS: + avalue += os->filesz(); + break; + default: + gold_unreachable(); } - break; + } + break; - case Symbol::CONSTANT: - value = sym->value(); - break; + case Symbol::IS_CONSTANT: + avalue = sym->value(); + break; - default: - gold_unreachable(); - } + case Symbol::IS_UNDEFINED: + avalue = 0; + break; + + default: + gold_unreachable(); + } - sym->set_value(value); + *pstatus = CFVS_OK; + return avalue; +} - if (parameters->strip_all()) - sym->set_symtab_index(-1U); - else - { - sym->set_symtab_index(index); - pool->add(sym->name(), false, NULL); - ++index; - off += sym_size; - } +// 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; } - this->output_count_ = index - orig_index; + // Compute final symbol value. + Compute_final_value_status status; + Value_type avalue = this->compute_final_value(sym, &status); - return off; + switch (status) + { + case CFVS_OK: + break; + case CFVS_UNSUPPORTED_SYMBOL_SECTION: + { + bool is_ordinary; + unsigned int sec_shndx = sym->shndx(&is_ordinary); + gold_error(_("%s: unsupported symbol section 0x%x"), + sym->demangled_name().c_str(), sec_shndx); + } + break; + case CFVS_NO_OUTPUT_SECTION: + sym->set_symtab_index(-1U); + return false; + default: + gold_unreachable(); + } + + sym->set_value(avalue); + + if (parameters->options().strip_all() + || !parameters->options().should_retain_symbol(sym->name())) + { + sym->set_symtab_index(-1U); + return false; + } + + return true; } // Write out the global symbols. void -Symbol_table::write_globals(const Input_objects* input_objects, - const Stringpool* sympool, - const Stringpool* dynpool, Output_file* of) const +Symbol_table::write_globals(const Stringpool* sympool, + const Stringpool* dynpool, + Output_symtab_xindex* symtab_xindex, + Output_symtab_xindex* dynsym_xindex, + Output_file* of) const { - if (parameters->get_size() == 32) + switch (parameters->size_and_endianness()) { - if (parameters->is_big_endian()) - { -#ifdef HAVE_TARGET_32_BIG - this->sized_write_globals<32, true>(input_objects, sympool, - dynpool, of); -#else - gold_unreachable(); -#endif - } - else - { #ifdef HAVE_TARGET_32_LITTLE - this->sized_write_globals<32, false>(input_objects, sympool, - dynpool, of); -#else - gold_unreachable(); + case Parameters::TARGET_32_LITTLE: + this->sized_write_globals<32, false>(sympool, dynpool, symtab_xindex, + dynsym_xindex, of); + break; #endif - } - } - else if (parameters->get_size() == 64) - { - if (parameters->is_big_endian()) - { -#ifdef HAVE_TARGET_64_BIG - this->sized_write_globals<64, true>(input_objects, sympool, - dynpool, of); -#else - gold_unreachable(); +#ifdef HAVE_TARGET_32_BIG + case Parameters::TARGET_32_BIG: + this->sized_write_globals<32, true>(sympool, dynpool, symtab_xindex, + dynsym_xindex, of); + break; #endif - } - else - { #ifdef HAVE_TARGET_64_LITTLE - this->sized_write_globals<64, false>(input_objects, sympool, - dynpool, of); -#else - gold_unreachable(); + case Parameters::TARGET_64_LITTLE: + this->sized_write_globals<64, false>(sympool, dynpool, symtab_xindex, + dynsym_xindex, of); + break; #endif - } +#ifdef HAVE_TARGET_64_BIG + case Parameters::TARGET_64_BIG: + this->sized_write_globals<64, true>(sympool, dynpool, symtab_xindex, + dynsym_xindex, of); + break; +#endif + default: + gold_unreachable(); } - else - gold_unreachable(); } // Write out the global symbols. template void -Symbol_table::sized_write_globals(const Input_objects* input_objects, - const Stringpool* sympool, +Symbol_table::sized_write_globals(const Stringpool* sympool, const Stringpool* dynpool, + Output_symtab_xindex* symtab_xindex, + Output_symtab_xindex* dynsym_xindex, Output_file* of) const { - const Target* const target = input_objects->target(); + const Target& target = parameters->target(); const int sym_size = elfcpp::Elf_sizes::sym_size; - unsigned int index = this->first_global_index_; - const off_t oview_size = this->output_count_ * sym_size; - unsigned char* const psyms = of->get_output_view(this->offset_, oview_size); - unsigned int dynamic_count = this->dynamic_count_; - off_t dynamic_size = dynamic_count * sym_size; - unsigned int first_dynamic_global_index = this->first_dynamic_global_index_; + const unsigned int output_count = this->output_count_; + const section_size_type oview_size = output_count * sym_size; + const unsigned int first_global_index = this->first_global_index_; + unsigned char* psyms; + if (this->offset_ == 0 || output_count == 0) + psyms = NULL; + else + psyms = of->get_output_view(this->offset_, oview_size); + + const unsigned int dynamic_count = this->dynamic_count_; + const section_size_type dynamic_size = dynamic_count * sym_size; + const unsigned int first_dynamic_global_index = + this->first_dynamic_global_index_; unsigned char* dynamic_view; - if (this->dynamic_offset_ == 0) + if (this->dynamic_offset_ == 0 || dynamic_count == 0) dynamic_view = NULL; else dynamic_view = of->get_output_view(this->dynamic_offset_, dynamic_size); - unsigned char* ps = psyms; for (Symbol_table_type::const_iterator p = this->table_.begin(); p != this->table_.end(); ++p) @@ -1667,7 +2651,7 @@ Symbol_table::sized_write_globals(const Input_objects* input_objects, Sized_symbol* sym = static_cast*>(p->second); // Possibly warn about unresolved symbols in shared libraries. - this->warn_about_undefined_dynobj_symbol(input_objects, sym); + this->warn_about_undefined_dynobj_symbol(sym); unsigned int sym_index = sym->symtab_index(); unsigned int dynsym_index; @@ -1682,33 +2666,23 @@ Symbol_table::sized_write_globals(const Input_objects* input_objects, continue; } - if (sym_index == index) - ++index; - else if (sym_index != -1U) - { - // We have already seen this symbol, because it has a - // default version. - gold_assert(sym_index < index); - if (dynsym_index == -1U) - continue; - sym_index = -1U; - } - - unsigned int shndx; - typename elfcpp::Elf_types<32>::Elf_Addr value = sym->value(); + unsigned int sec_shndx; + typename elfcpp::Elf_types::Elf_Addr sym_value = sym->value(); + typename elfcpp::Elf_types::Elf_Addr dynsym_value = sym_value; switch (sym->source()) { case Symbol::FROM_OBJECT: { - unsigned int in_shndx = sym->shndx(); + bool is_ordinary; + unsigned int in_shndx = sym->shndx(&is_ordinary); - // FIXME: We need some target specific support here. - if (in_shndx >= elfcpp::SHN_LORESERVE - && in_shndx != elfcpp::SHN_ABS) + if (!is_ordinary + && in_shndx != elfcpp::SHN_ABS + && !Symbol::is_common_shndx(in_shndx)) { gold_error(_("%s: unsupported symbol section 0x%x"), sym->demangled_name().c_str(), in_shndx); - shndx = in_shndx; + sec_shndx = in_shndx; } else { @@ -1716,35 +2690,76 @@ Symbol_table::sized_write_globals(const Input_objects* input_objects, if (symobj->is_dynamic()) { if (sym->needs_dynsym_value()) - value = target->dynsym_value(sym); - shndx = elfcpp::SHN_UNDEF; + dynsym_value = target.dynsym_value(sym); + sec_shndx = elfcpp::SHN_UNDEF; } + else if (symobj->pluginobj() != NULL) + sec_shndx = elfcpp::SHN_UNDEF; else if (in_shndx == elfcpp::SHN_UNDEF - || in_shndx == elfcpp::SHN_ABS) - shndx = in_shndx; + || (!is_ordinary + && (in_shndx == elfcpp::SHN_ABS + || Symbol::is_common_shndx(in_shndx)))) + sec_shndx = in_shndx; else { Relobj* relobj = static_cast(symobj); - section_offset_type secoff; - Output_section* os = relobj->output_section(in_shndx, - &secoff); + Output_section* os = relobj->output_section(in_shndx); + if (this->is_section_folded(relobj, in_shndx)) + { + // This global symbol must be written out even though + // it is folded. + // Get the os of the section it is folded onto. + Section_id folded = + this->icf_->get_folded_section(relobj, in_shndx); + gold_assert(folded.first !=NULL); + Relobj* folded_obj = + reinterpret_cast(folded.first); + os = folded_obj->output_section(folded.second); + gold_assert(os != NULL); + } gold_assert(os != NULL); - shndx = os->out_shndx(); + sec_shndx = os->out_shndx(); + + if (sec_shndx >= elfcpp::SHN_LORESERVE) + { + if (sym_index != -1U) + symtab_xindex->add(sym_index, sec_shndx); + if (dynsym_index != -1U) + dynsym_xindex->add(dynsym_index, sec_shndx); + sec_shndx = elfcpp::SHN_XINDEX; + } + + // In object files symbol values are section + // relative. + if (parameters->options().relocatable()) + sym_value -= os->address(); } } } break; case Symbol::IN_OUTPUT_DATA: - shndx = sym->output_data()->out_shndx(); + sec_shndx = sym->output_data()->out_shndx(); + if (sec_shndx >= elfcpp::SHN_LORESERVE) + { + if (sym_index != -1U) + symtab_xindex->add(sym_index, sec_shndx); + if (dynsym_index != -1U) + dynsym_xindex->add(dynsym_index, sec_shndx); + sec_shndx = elfcpp::SHN_XINDEX; + } break; case Symbol::IN_OUTPUT_SEGMENT: - shndx = elfcpp::SHN_ABS; + sec_shndx = elfcpp::SHN_ABS; + break; + + case Symbol::IS_CONSTANT: + sec_shndx = elfcpp::SHN_ABS; break; - case Symbol::CONSTANT: - shndx = elfcpp::SHN_ABS; + case Symbol::IS_UNDEFINED: + sec_shndx = elfcpp::SHN_UNDEF; break; default: @@ -1753,10 +2768,11 @@ Symbol_table::sized_write_globals(const Input_objects* input_objects, if (sym_index != -1U) { - this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - sym, sym->value(), shndx, sympool, ps - SELECT_SIZE_ENDIAN(size, big_endian)); - ps += sym_size; + sym_index -= first_global_index; + gold_assert(sym_index < output_count); + unsigned char* ps = psyms + (sym_index * sym_size); + this->sized_write_symbol(sym, sym_value, sec_shndx, + sympool, ps); } if (dynsym_index != -1U) @@ -1764,14 +2780,11 @@ Symbol_table::sized_write_globals(const Input_objects* input_objects, dynsym_index -= first_dynamic_global_index; gold_assert(dynsym_index < dynamic_count); unsigned char* pd = dynamic_view + (dynsym_index * sym_size); - this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - sym, value, shndx, dynpool, pd - SELECT_SIZE_ENDIAN(size, big_endian)); + this->sized_write_symbol(sym, dynsym_value, sec_shndx, + dynpool, pd); } } - gold_assert(ps - psyms == oview_size); - of->write_output_view(this->offset_, oview_size, psyms); if (dynamic_view != NULL) of->write_output_view(this->dynamic_offset_, dynamic_size, dynamic_view); @@ -1784,19 +2797,31 @@ template void Symbol_table::sized_write_symbol( Sized_symbol* sym, - typename elfcpp::Elf_types::Elf_Addr value, - unsigned int shndx, + typename elfcpp::Elf_types::Elf_Addr avalue, + unsigned int sec_shndx, const Stringpool* pool, - unsigned char* p - ACCEPT_SIZE_ENDIAN) const + unsigned char* p) const { elfcpp::Sym_write osym(p); osym.put_st_name(pool->get_offset(sym->name())); - osym.put_st_value(value); - osym.put_st_size(sym->symsize()); - osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type())); + osym.put_st_value(avalue); + // Use a symbol size of zero for undefined symbols from shared libraries. + if (sec_shndx == elfcpp::SHN_UNDEF && sym->is_from_dynobj()) + 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, type)); + else + osym.put_st_info(elfcpp::elf_st_info(sym->binding(), type)); osym.put_st_other(elfcpp::elf_st_other(sym->visibility(), sym->nonvis())); - osym.put_st_shndx(shndx); + osym.put_st_shndx(sec_shndx); } // Check for unresolved symbols in shared libraries. This is @@ -1808,31 +2833,27 @@ Symbol_table::sized_write_symbol( // entry, we aren't going to be able to reliably report whether the // symbol is undefined. -// We also don't warn about libraries found in the system library -// directory (the directory were we find libc.so); we assume that -// those libraries are OK. This heuristic avoids problems in -// GNU/Linux, in which -ldl can have undefined references satisfied by -// ld-linux.so. +// We also don't warn about libraries found in a system library +// directory (e.g., /lib or /usr/lib); we assume that those libraries +// are OK. This heuristic avoids problems on GNU/Linux, in which -ldl +// can have undefined references satisfied by ld-linux.so. inline void -Symbol_table::warn_about_undefined_dynobj_symbol( - const Input_objects* input_objects, - Symbol* sym) const +Symbol_table::warn_about_undefined_dynobj_symbol(Symbol* sym) const { + bool dummy; if (sym->source() == Symbol::FROM_OBJECT && sym->object()->is_dynamic() - && sym->shndx() == elfcpp::SHN_UNDEF + && sym->shndx(&dummy) == elfcpp::SHN_UNDEF && sym->binding() != elfcpp::STB_WEAK - && !parameters->allow_shlib_undefined() - && !input_objects->target()->is_defined_by_abi(sym) - && !input_objects->found_in_system_library_directory(sym->object())) + && !parameters->options().allow_shlib_undefined() + && !parameters->target().is_defined_by_abi(sym) + && !sym->object()->is_in_system_directory()) { // A very ugly cast. Dynobj* dynobj = static_cast(sym->object()); if (!dynobj->has_unknown_needed_entries()) - gold_error(_("%s: undefined reference to '%s'"), - sym->object()->name().c_str(), - sym->demangled_name().c_str()); + gold_undefined_symbol(sym); } } @@ -1840,49 +2861,39 @@ Symbol_table::warn_about_undefined_dynobj_symbol( void Symbol_table::write_section_symbol(const Output_section *os, + Output_symtab_xindex* symtab_xindex, Output_file* of, off_t offset) const { - if (parameters->get_size() == 32) + switch (parameters->size_and_endianness()) { - if (parameters->is_big_endian()) - { -#ifdef HAVE_TARGET_32_BIG - this->sized_write_section_symbol<32, true>(os, of, offset); -#else - gold_unreachable(); -#endif - } - else - { #ifdef HAVE_TARGET_32_LITTLE - this->sized_write_section_symbol<32, false>(os, of, offset); -#else - gold_unreachable(); + case Parameters::TARGET_32_LITTLE: + this->sized_write_section_symbol<32, false>(os, symtab_xindex, of, + offset); + break; #endif - } - } - else if (parameters->get_size() == 64) - { - if (parameters->is_big_endian()) - { -#ifdef HAVE_TARGET_64_BIG - this->sized_write_section_symbol<64, true>(os, of, offset); -#else - gold_unreachable(); +#ifdef HAVE_TARGET_32_BIG + case Parameters::TARGET_32_BIG: + this->sized_write_section_symbol<32, true>(os, symtab_xindex, of, + offset); + break; #endif - } - else - { #ifdef HAVE_TARGET_64_LITTLE - this->sized_write_section_symbol<64, false>(os, of, offset); -#else - gold_unreachable(); + case Parameters::TARGET_64_LITTLE: + this->sized_write_section_symbol<64, false>(os, symtab_xindex, of, + offset); + break; #endif - } +#ifdef HAVE_TARGET_64_BIG + case Parameters::TARGET_64_BIG: + this->sized_write_section_symbol<64, true>(os, symtab_xindex, of, + offset); + break; +#endif + default: + gold_unreachable(); } - else - gold_unreachable(); } // Write out a section symbol, specialized for size and endianness. @@ -1890,6 +2901,7 @@ Symbol_table::write_section_symbol(const Output_section *os, template void Symbol_table::sized_write_section_symbol(const Output_section* os, + Output_symtab_xindex* symtab_xindex, Output_file* of, off_t offset) const { @@ -1899,12 +2911,22 @@ Symbol_table::sized_write_section_symbol(const Output_section* os, elfcpp::Sym_write osym(pov); osym.put_st_name(0); - osym.put_st_value(os->address()); + if (parameters->options().relocatable()) + osym.put_st_value(0); + else + osym.put_st_value(os->address()); osym.put_st_size(0); osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, elfcpp::STT_SECTION)); osym.put_st_other(elfcpp::elf_st_other(elfcpp::STV_DEFAULT, 0)); - osym.put_st_shndx(os->out_shndx()); + + unsigned int sec_shndx = os->out_shndx(); + if (sec_shndx >= elfcpp::SHN_LORESERVE) + { + symtab_xindex->add(os->symtab_index(), sec_shndx); + sec_shndx = elfcpp::SHN_XINDEX; + } + osym.put_st_shndx(sec_shndx); of->write_output_view(offset, sym_size, pov); } @@ -1977,10 +2999,12 @@ Symbol_table::detect_odr_violations(const Task* task, // want to run this in a general Task for better // performance, we will need one Task for object, plus // appropriate locking to ensure that we don't conflict with - // other uses of the object. + // other uses of the object. Also note, one_addr2line is not + // currently thread-safe. Task_lock_obj tl(task, locs->object); + // 16 is the size of the object-cache that one_addr2line should use. std::string lineno = Dwarf_line_info::one_addr2line( - locs->object, locs->shndx, locs->offset); + locs->object, locs->shndx, locs->offset, 16); if (!lineno.empty()) line_nums.insert(lineno); } @@ -1996,6 +3020,8 @@ Symbol_table::detect_odr_violations(const Task* task, fprintf(stderr, " %s\n", it2->c_str()); } } + // We only call one_addr2line() in this function, so we can clear its cache. + Dwarf_line_info::clear_addr2line_cache(); } // Warnings functions. @@ -2003,11 +3029,11 @@ Symbol_table::detect_odr_violations(const Task* task, // Add a new warning. void -Warnings::add_warning(Symbol_table* symtab, const char* name, Object* obj, - unsigned int shndx) +Warnings::add_warning(Symbol_table* symtab, const char* aname, Object* obj, + const std::string& warning) { - name = symtab->canonicalize_name(name); - this->warnings_[name].set(obj, shndx); + aname = symtab->canonicalize_name(aname); + this->warnings_[aname].set(obj, warning); } // Look through the warnings and mark the symbols for which we should @@ -2015,7 +3041,7 @@ Warnings::add_warning(Symbol_table* symtab, const char* name, Object* obj, // sources for all the symbols. void -Warnings::note_warnings(Symbol_table* symtab, const Task* task) +Warnings::note_warnings(Symbol_table* symtab) { for (Warning_table::iterator p = this->warnings_.begin(); p != this->warnings_.end(); @@ -2025,24 +3051,7 @@ Warnings::note_warnings(Symbol_table* symtab, const Task* task) if (sym != NULL && sym->source() == Symbol::FROM_OBJECT && sym->object() == p->second.object) - { - sym->set_has_warning(); - - // Read the section contents to get the warning text. It - // would be nicer if we only did this if we have to actually - // issue a warning. Unfortunately, warnings are issued as - // we relocate sections. That means that we can not lock - // the object then, as we might try to issue the same - // warning multiple times simultaneously. - { - Task_lock_obj tl(task, p->second.object); - const unsigned char* c; - section_size_type len; - c = p->second.object->section_contents(p->second.shndx, &len, - false); - p->second.set_text(reinterpret_cast(c), len); - } - } + sym->set_has_warning(); } } @@ -2085,9 +3094,11 @@ Symbol_table::add_from_relobj<32, false>( Sized_relobj<32, false>* relobj, const unsigned char* syms, size_t count, + size_t symndx_offset, const char* sym_names, size_t sym_name_size, - Sized_relobj<32, true>::Symbols* sympointers); + Sized_relobj<32, false>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_32_BIG @@ -2097,9 +3108,11 @@ Symbol_table::add_from_relobj<32, true>( Sized_relobj<32, true>* relobj, const unsigned char* syms, size_t count, + size_t symndx_offset, const char* sym_names, size_t sym_name_size, - Sized_relobj<32, false>::Symbols* sympointers); + Sized_relobj<32, true>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_64_LITTLE @@ -2109,9 +3122,11 @@ Symbol_table::add_from_relobj<64, false>( Sized_relobj<64, false>* relobj, const unsigned char* syms, size_t count, + size_t symndx_offset, const char* sym_names, size_t sym_name_size, - Sized_relobj<64, true>::Symbols* sympointers); + Sized_relobj<64, false>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_64_BIG @@ -2121,9 +3136,51 @@ Symbol_table::add_from_relobj<64, true>( Sized_relobj<64, true>* relobj, const unsigned char* syms, size_t count, + size_t symndx_offset, const char* sym_names, size_t sym_name_size, - Sized_relobj<64, false>::Symbols* sympointers); + Sized_relobj<64, true>::Symbols* sympointers, + size_t* defined); +#endif + +#ifdef HAVE_TARGET_32_LITTLE +template +Symbol* +Symbol_table::add_from_pluginobj<32, false>( + Sized_pluginobj<32, false>* obj, + const char* name, + const char* ver, + elfcpp::Sym<32, false>* sym); +#endif + +#ifdef HAVE_TARGET_32_BIG +template +Symbol* +Symbol_table::add_from_pluginobj<32, true>( + Sized_pluginobj<32, true>* obj, + const char* name, + const char* ver, + elfcpp::Sym<32, true>* sym); +#endif + +#ifdef HAVE_TARGET_64_LITTLE +template +Symbol* +Symbol_table::add_from_pluginobj<64, false>( + Sized_pluginobj<64, false>* obj, + const char* name, + const char* ver, + elfcpp::Sym<64, false>* sym); +#endif + +#ifdef HAVE_TARGET_64_BIG +template +Symbol* +Symbol_table::add_from_pluginobj<64, true>( + Sized_pluginobj<64, true>* obj, + const char* name, + const char* ver, + elfcpp::Sym<64, true>* sym); #endif #ifdef HAVE_TARGET_32_LITTLE @@ -2137,7 +3194,9 @@ Symbol_table::add_from_dynobj<32, false>( size_t sym_name_size, const unsigned char* versym, size_t versym_size, - const std::vector* version_map); + const std::vector* version_map, + Sized_relobj<32, false>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_32_BIG @@ -2151,7 +3210,9 @@ Symbol_table::add_from_dynobj<32, true>( size_t sym_name_size, const unsigned char* versym, size_t versym_size, - const std::vector* version_map); + const std::vector* version_map, + Sized_relobj<32, true>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_64_LITTLE @@ -2165,7 +3226,9 @@ Symbol_table::add_from_dynobj<64, false>( size_t sym_name_size, const unsigned char* versym, size_t versym_size, - const std::vector* version_map); + const std::vector* version_map, + Sized_relobj<64, false>::Symbols* sympointers, + size_t* defined); #endif #ifdef HAVE_TARGET_64_BIG @@ -2179,27 +3242,27 @@ Symbol_table::add_from_dynobj<64, true>( size_t sym_name_size, const unsigned char* versym, size_t versym_size, - const std::vector* version_map); + const std::vector* version_map, + Sized_relobj<64, true>::Symbols* sympointers, + size_t* defined); #endif #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) template void Symbol_table::define_with_copy_reloc<32>( - const Target* target, Sized_symbol<32>* sym, Output_data* posd, - elfcpp::Elf_types<32>::Elf_Addr value); + elfcpp::Elf_types<32>::Elf_Addr avalue); #endif #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) template void Symbol_table::define_with_copy_reloc<64>( - const Target* target, Sized_symbol<64>* sym, Output_data* posd, - elfcpp::Elf_types<64>::Elf_Addr value); + elfcpp::Elf_types<64>::Elf_Addr avalue); #endif #ifdef HAVE_TARGET_32_LITTLE