X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fresolve.cc;h=9a402f39277e97ccb6da798691336ffc9b74663a;hb=880cd20d40938ea13ff9d5dbb9393f80cfb98b75;hp=b8e5e701cb74c58b5abce3a0c1d468228fabf8a5;hpb=16649710df23ad9038e0057035882a92e783f7e6;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/resolve.cc b/gold/resolve.cc index b8e5e701cb..9a402f3927 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -1,32 +1,109 @@ // resolve.cc -- symbol resolution for gold +// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Written by Ian Lance Taylor . + +// This file is part of gold. + +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +// MA 02110-1301, USA. + #include "gold.h" #include "elfcpp.h" #include "target.h" #include "object.h" #include "symtab.h" +#include "plugin.h" namespace gold { // Symbol methods used in this file. +// This symbol is being overridden by another symbol whose version is +// VERSION. Update the VERSION_ field accordingly. + +inline void +Symbol::override_version(const char* version) +{ + if (version == NULL) + { + // This is the case where this symbol is NAME/VERSION, and the + // version was not marked as hidden. That makes it the default + // version, so we create NAME/NULL. Later we see another symbol + // NAME/NULL, and that symbol is overriding this one. In this + // case, since NAME/VERSION is the default, we make NAME/NULL + // override NAME/VERSION as well. They are already the same + // Symbol structure. Setting the VERSION_ field to NULL ensures + // that it will be output with the correct, empty, version. + this->version_ = version; + } + else + { + // This is the case where this symbol is NAME/VERSION_ONE, and + // now we see NAME/VERSION_TWO, and NAME/VERSION_TWO is + // overriding NAME. If VERSION_ONE and VERSION_TWO are + // different, then this can only happen when VERSION_ONE is NULL + // and VERSION_TWO is not hidden. + gold_assert(this->version_ == version || this->version_ == NULL); + this->version_ = version; + } +} + +// This symbol is being overidden by another symbol whose visibility +// is VISIBILITY. Updated the VISIBILITY_ field accordingly. + +inline void +Symbol::override_visibility(elfcpp::STV visibility) +{ + // The rule for combining visibility is that we always choose the + // most constrained visibility. In order of increasing constraint, + // visibility goes PROTECTED, HIDDEN, INTERNAL. This is the reverse + // of the numeric values, so the effect is that we always want the + // smallest non-zero value. + if (visibility != elfcpp::STV_DEFAULT) + { + if (this->visibility_ == elfcpp::STV_DEFAULT) + this->visibility_ = visibility; + else if (this->visibility_ > visibility) + this->visibility_ = visibility; + } +} + // Override the fields in Symbol. template void Symbol::override_base(const elfcpp::Sym& sym, - Object* object) + unsigned int st_shndx, bool is_ordinary, + Object* object, const char* version) { gold_assert(this->source_ == FROM_OBJECT); this->u_.from_object.object = object; - // FIXME: Handle SHN_XINDEX. - this->u_.from_object.shndx = sym.get_st_shndx(); + this->override_version(version); + this->u_.from_object.shndx = st_shndx; + this->is_ordinary_shndx_ = is_ordinary; this->type_ = sym.get_st_type(); this->binding_ = sym.get_st_bind(); - this->visibility_ = sym.get_st_visibility(); + this->override_visibility(sym.get_st_visibility()); this->nonvis_ = sym.get_st_nonvis(); + if (object->is_dynamic()) + this->in_dyn_ = true; + else + this->in_reg_ = true; } // Override the fields in Sized_symbol. @@ -35,153 +112,293 @@ template template void Sized_symbol::override(const elfcpp::Sym& sym, - Object* object) + unsigned st_shndx, bool is_ordinary, + Object* object, const char* version) { - this->override_base(sym, object); + this->override_base(sym, st_shndx, is_ordinary, object, version); this->value_ = sym.get_st_value(); this->symsize_ = sym.get_st_size(); } -// Resolve a symbol. This is called the second and subsequent times -// we see a symbol. TO is the pre-existing symbol. SYM is the new -// symbol, seen in OBJECT. +// Override TOSYM with symbol FROMSYM, defined in OBJECT, with version +// VERSION. This handles all aliases of TOSYM. template void -Symbol_table::resolve(Sized_symbol* to, - const elfcpp::Sym& sym, - Object* object) +Symbol_table::override(Sized_symbol* tosym, + const elfcpp::Sym& fromsym, + unsigned int st_shndx, bool is_ordinary, + Object* object, const char* version) { - if (object->target()->has_resolve()) + tosym->override(fromsym, st_shndx, is_ordinary, object, version); + if (tosym->has_alias()) { - Sized_target* sized_target; - sized_target = object->sized_target - SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - SELECT_SIZE_ENDIAN_ONLY(size, big_endian)); - sized_target->resolve(to, sym, object); - return; + Symbol* sym = this->weak_aliases_[tosym]; + gold_assert(sym != NULL); + Sized_symbol* ssym = this->get_sized_symbol(sym); + do + { + ssym->override(fromsym, st_shndx, is_ordinary, object, version); + sym = this->weak_aliases_[ssym]; + gold_assert(sym != NULL); + ssym = this->get_sized_symbol(sym); + } + while (ssym != tosym); } +} - // Build a little code for each symbol. - // Bit 0: 0 for global, 1 for weak. - // Bit 1: 0 for regular object, 1 for shared object - // Bits 2-3: 0 for normal, 1 for undefined, 2 for common - // This gives us values from 0 to 11: +// The resolve functions build a little code for each symbol. +// Bit 0: 0 for global, 1 for weak. +// Bit 1: 0 for regular object, 1 for shared object +// Bits 2-3: 0 for normal, 1 for undefined, 2 for common +// This gives us values from 0 to 11. - enum - { - DEF = 0, - WEAK_DEF = 1, - DYN_DEF = 2, - DYN_WEAK_DEF = 3, - UNDEF = 4, - WEAK_UNDEF = 5, - DYN_UNDEF = 6, - DYN_WEAK_UNDEF = 7, - COMMON = 8, - WEAK_COMMON = 9, - DYN_COMMON = 10, - DYN_WEAK_COMMON = 11 - }; +static const int global_or_weak_shift = 0; +static const unsigned int global_flag = 0 << global_or_weak_shift; +static const unsigned int weak_flag = 1 << global_or_weak_shift; + +static const int regular_or_dynamic_shift = 1; +static const unsigned int regular_flag = 0 << regular_or_dynamic_shift; +static const unsigned int dynamic_flag = 1 << regular_or_dynamic_shift; + +static const int def_undef_or_common_shift = 2; +static const unsigned int def_flag = 0 << def_undef_or_common_shift; +static const unsigned int undef_flag = 1 << def_undef_or_common_shift; +static const unsigned int common_flag = 2 << def_undef_or_common_shift; - int tobits; - switch (to->binding()) +// This convenience function combines all the flags based on facts +// about the symbol. + +static unsigned int +symbol_to_bits(elfcpp::STB binding, bool is_dynamic, + unsigned int shndx, bool is_ordinary, elfcpp::STT type) +{ + unsigned int bits; + + switch (binding) { case elfcpp::STB_GLOBAL: - tobits = 0; + case elfcpp::STB_GNU_UNIQUE: + bits = global_flag; break; case elfcpp::STB_WEAK: - tobits = 1; + bits = weak_flag; break; case elfcpp::STB_LOCAL: // We should only see externally visible symbols in the symbol // table. - gold_unreachable(); + gold_error(_("invalid STB_LOCAL symbol in external symbols")); + bits = global_flag; default: // Any target which wants to handle STB_LOOS, etc., needs to // define a resolve method. - gold_unreachable(); + gold_error(_("unsupported symbol binding")); + bits = global_flag; } - if (to->source() == Symbol::FROM_OBJECT - && to->object()->is_dynamic()) - tobits |= (1 << 1); + if (is_dynamic) + bits |= dynamic_flag; + else + bits |= regular_flag; - switch (to->shndx()) + switch (shndx) { case elfcpp::SHN_UNDEF: - tobits |= (1 << 2); + bits |= undef_flag; break; case elfcpp::SHN_COMMON: - tobits |= (2 << 2); + if (!is_ordinary) + bits |= common_flag; break; default: - if (to->type() == elfcpp::STT_COMMON) - tobits |= (2 << 2); + if (type == elfcpp::STT_COMMON) + bits |= common_flag; + else if (!is_ordinary && Symbol::is_common_shndx(shndx)) + bits |= common_flag; + else + bits |= def_flag; break; } - int frombits; - switch (sym.get_st_bind()) - { - case elfcpp::STB_GLOBAL: - frombits = 0; - break; - - case elfcpp::STB_WEAK: - frombits = 1; - break; + return bits; +} - case elfcpp::STB_LOCAL: - fprintf(stderr, - _("%s: %s: invalid STB_LOCAL symbol %s in external symbols\n"), - program_name, object->name().c_str(), to->name()); - gold_exit(false); +// Resolve a symbol. This is called the second and subsequent times +// we see a symbol. TO is the pre-existing symbol. ST_SHNDX is the +// section index for SYM, possibly adjusted for many sections. +// IS_ORDINARY is whether ST_SHNDX is a normal section index rather +// than a special code. ORIG_ST_SHNDX is the original section index, +// before any munging because of discarded sections, except that all +// non-ordinary section indexes are mapped to SHN_UNDEF. VERSION is +// the version of SYM. - default: - fprintf(stderr, - _("%s: %s: unsupported symbol binding %d for symbol %s\n"), - program_name, object->name().c_str(), - static_cast(sym.get_st_bind()), to->name()); - gold_exit(false); +template +void +Symbol_table::resolve(Sized_symbol* to, + const elfcpp::Sym& sym, + unsigned int st_shndx, bool is_ordinary, + unsigned int orig_st_shndx, + Object* object, const char* version) +{ + if (parameters->target().has_resolve()) + { + Sized_target* sized_target; + sized_target = parameters->sized_target(); + sized_target->resolve(to, sym, object, version); + return; } - if (object->is_dynamic()) + if (!object->is_dynamic()) + { + // Record that we've seen this symbol in a regular object. + to->set_in_reg(); + } + else if (st_shndx == elfcpp::SHN_UNDEF + && (to->visibility() == elfcpp::STV_HIDDEN + || to->visibility() == elfcpp::STV_INTERNAL)) + { + // A dynamic object cannot reference a hidden or internal symbol + // defined in another object. + gold_warning(_("%s symbol '%s' in %s is referenced by DSO %s"), + (to->visibility() == elfcpp::STV_HIDDEN + ? "hidden" + : "internal"), + to->demangled_name().c_str(), + to->object()->name().c_str(), + object->name().c_str()); + return; + } + else { - frombits |= (1 << 1); - // Record that we've seen this symbol in a dynamic object. to->set_in_dyn(); } - switch (sym.get_st_shndx()) + // Record if we've seen this symbol in a real ELF object (i.e., the + // symbol is referenced from outside the world known to the plugin). + if (object->pluginobj() == NULL) + to->set_in_real_elf(); + + // If we're processing replacement files, allow new symbols to override + // the placeholders from the plugin objects. + if (to->source() == Symbol::FROM_OBJECT) { - case elfcpp::SHN_UNDEF: - frombits |= (1 << 2); - break; + Pluginobj* obj = to->object()->pluginobj(); + if (obj != NULL + && parameters->options().plugins()->in_replacement_phase()) + { + this->override(to, sym, st_shndx, is_ordinary, object, version); + return; + } + } - case elfcpp::SHN_COMMON: - frombits |= (2 << 2); - break; + unsigned int frombits = symbol_to_bits(sym.get_st_bind(), + object->is_dynamic(), + st_shndx, is_ordinary, + sym.get_st_type()); - default: - if (sym.get_st_type() == elfcpp::STT_COMMON) - frombits |= (2 << 2); - break; + bool adjust_common_sizes; + typename Sized_symbol::Size_type tosize = to->symsize(); + if (Symbol_table::should_override(to, frombits, OBJECT, object, + &adjust_common_sizes)) + { + this->override(to, sym, st_shndx, is_ordinary, object, version); + if (adjust_common_sizes && tosize > to->symsize()) + to->set_symsize(tosize); + } + else + { + if (adjust_common_sizes && sym.get_st_size() > tosize) + to->set_symsize(sym.get_st_size()); + // The ELF ABI says that even for a reference to a symbol we + // merge the visibility. + to->override_visibility(sym.get_st_visibility()); } - if ((tobits & (1 << 1)) != (frombits & (1 << 1))) + if (adjust_common_sizes && parameters->options().warn_common()) { - // This symbol is seen in both a dynamic object and a regular - // object. That means that we need the symbol to go into the - // dynamic symbol table, so that the dynamic linker can use the - // regular symbol to override or define the dynamic symbol. - to->set_needs_dynsym_entry(); + if (tosize > sym.get_st_size()) + Symbol_table::report_resolve_problem(false, + _("common of '%s' overriding " + "smaller common"), + to, OBJECT, object); + else if (tosize < sym.get_st_size()) + Symbol_table::report_resolve_problem(false, + _("common of '%s' overidden by " + "larger common"), + to, OBJECT, object); + else + Symbol_table::report_resolve_problem(false, + _("multiple common of '%s'"), + to, OBJECT, object); + } + + // A new weak undefined reference, merging with an old weak + // reference, could be a One Definition Rule (ODR) violation -- + // especially if the types or sizes of the references differ. We'll + // store such pairs and look them up later to make sure they + // actually refer to the same lines of code. (Note: not all ODR + // violations can be found this way, and not everything this finds + // is an ODR violation. But it's helpful to warn about.) + bool to_is_ordinary; + if (parameters->options().detect_odr_violations() + && sym.get_st_bind() == elfcpp::STB_WEAK + && to->binding() == elfcpp::STB_WEAK + && orig_st_shndx != elfcpp::SHN_UNDEF + && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF + && to_is_ordinary + && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. + && to->symsize() != 0 + && (sym.get_st_type() != to->type() + || sym.get_st_size() != to->symsize()) + // C does not have a concept of ODR, so we only need to do this + // on C++ symbols. These have (mangled) names starting with _Z. + && to->name()[0] == '_' && to->name()[1] == 'Z') + { + Symbol_location fromloc + = { object, orig_st_shndx, sym.get_st_value() }; + Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + to->value() }; + this->candidate_odr_violations_[to->name()].insert(fromloc); + this->candidate_odr_violations_[to->name()].insert(toloc); + } +} + +// Handle the core of symbol resolution. This is called with the +// existing symbol, TO, and a bitflag describing the new symbol. This +// returns true if we should override the existing symbol with the new +// one, and returns false otherwise. It sets *ADJUST_COMMON_SIZES to +// true if we should set the symbol size to the maximum of the TO and +// FROM sizes. It handles error conditions. + +bool +Symbol_table::should_override(const Symbol* to, unsigned int frombits, + Defined defined, Object* object, + bool* adjust_common_sizes) +{ + *adjust_common_sizes = false; + + unsigned int tobits; + if (to->source() == Symbol::IS_UNDEFINED) + tobits = symbol_to_bits(to->binding(), false, elfcpp::SHN_UNDEF, true, + to->type()); + else if (to->source() != Symbol::FROM_OBJECT) + tobits = symbol_to_bits(to->binding(), false, elfcpp::SHN_ABS, false, + to->type()); + else + { + bool is_ordinary; + unsigned int shndx = to->shndx(&is_ordinary); + tobits = symbol_to_bits(to->binding(), + to->object()->is_dynamic(), + shndx, + is_ordinary, + to->type()); } // FIXME: Warn if either but not both of TO and SYM are STT_TLS. @@ -194,14 +411,40 @@ Symbol_table::resolve(Sized_symbol* to, // but that is no easier to understand than this large switch // statement. + // These are the values generated by the bit codes. + enum + { + DEF = global_flag | regular_flag | def_flag, + WEAK_DEF = weak_flag | regular_flag | def_flag, + DYN_DEF = global_flag | dynamic_flag | def_flag, + DYN_WEAK_DEF = weak_flag | dynamic_flag | def_flag, + UNDEF = global_flag | regular_flag | undef_flag, + WEAK_UNDEF = weak_flag | regular_flag | undef_flag, + DYN_UNDEF = global_flag | dynamic_flag | undef_flag, + DYN_WEAK_UNDEF = weak_flag | dynamic_flag | undef_flag, + COMMON = global_flag | regular_flag | common_flag, + WEAK_COMMON = weak_flag | regular_flag | common_flag, + DYN_COMMON = global_flag | dynamic_flag | common_flag, + DYN_WEAK_COMMON = weak_flag | dynamic_flag | common_flag + }; + switch (tobits * 16 + frombits) { case DEF * 16 + DEF: // Two definitions of the same symbol. - fprintf(stderr, "%s: %s: multiple definition of %s\n", - program_name, object->name().c_str(), to->name()); - // FIXME: Report locations. Record that we have seen an error. - return; + + // If either symbol is defined by an object included using + // --just-symbols, then don't warn. This is for compatibility + // with the GNU linker. FIXME: This is a hack. + if ((to->source() == Symbol::FROM_OBJECT && to->object()->just_symbols()) + || (object != NULL && object->just_symbols())) + return false; + + if (!parameters->options().muldefs()) + Symbol_table::report_resolve_problem(true, + _("multiple definition of '%s'"), + to, defined, object); + return false; case WEAK_DEF * 16 + DEF: // We've seen a weak definition, and now we see a strong @@ -212,8 +455,7 @@ Symbol_table::resolve(Sized_symbol* to, // are currently compatible with the GNU linker. In the future // we should add a target specific option to change this. // FIXME. - to->override(sym, object); - return; + return true; case DYN_DEF * 16 + DEF: case DYN_WEAK_DEF * 16 + DEF: @@ -221,8 +463,7 @@ Symbol_table::resolve(Sized_symbol* to, // definition in a regular object. The definition in the // regular object overrides the definition in the dynamic // object. - to->override(sym, object); - return; + return true; case UNDEF * 16 + DEF: case WEAK_UNDEF * 16 + DEF: @@ -230,66 +471,69 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_UNDEF * 16 + DEF: // We've seen an undefined reference, and now we see a // definition. We use the definition. - to->override(sym, object); - return; + return true; case COMMON * 16 + DEF: case WEAK_COMMON * 16 + DEF: case DYN_COMMON * 16 + DEF: case DYN_WEAK_COMMON * 16 + DEF: // We've seen a common symbol and now we see a definition. The - // definition overrides. FIXME: We should optionally issue a - // warning. - to->override(sym, object); - return; + // definition overrides. + if (parameters->options().warn_common()) + Symbol_table::report_resolve_problem(false, + _("definition of '%s' overriding " + "common"), + to, defined, object); + return true; case DEF * 16 + WEAK_DEF: case WEAK_DEF * 16 + WEAK_DEF: // We've seen a definition and now we see a weak definition. We // ignore the new weak definition. - return; + return false; case DYN_DEF * 16 + WEAK_DEF: case DYN_WEAK_DEF * 16 + WEAK_DEF: // We've seen a dynamic definition and now we see a regular weak // definition. The regular weak definition overrides. - to->override(sym, object); - return; + return true; case UNDEF * 16 + WEAK_DEF: case WEAK_UNDEF * 16 + WEAK_DEF: case DYN_UNDEF * 16 + WEAK_DEF: case DYN_WEAK_UNDEF * 16 + WEAK_DEF: // A weak definition of a currently undefined symbol. - to->override(sym, object); - return; + return true; case COMMON * 16 + WEAK_DEF: case WEAK_COMMON * 16 + WEAK_DEF: // A weak definition does not override a common definition. - return; + return false; case DYN_COMMON * 16 + WEAK_DEF: case DYN_WEAK_COMMON * 16 + WEAK_DEF: // A weak definition does override a definition in a dynamic - // object. FIXME: We should optionally issue a warning. - to->override(sym, object); - return; + // object. + if (parameters->options().warn_common()) + Symbol_table::report_resolve_problem(false, + _("definition of '%s' overriding " + "dynamic common definition"), + to, defined, object); + return true; case DEF * 16 + DYN_DEF: case WEAK_DEF * 16 + DYN_DEF: case DYN_DEF * 16 + DYN_DEF: case DYN_WEAK_DEF * 16 + DYN_DEF: // Ignore a dynamic definition if we already have a definition. - return; + return false; case UNDEF * 16 + DYN_DEF: case WEAK_UNDEF * 16 + DYN_DEF: case DYN_UNDEF * 16 + DYN_DEF: case DYN_WEAK_UNDEF * 16 + DYN_DEF: // Use a dynamic definition if we have a reference. - to->override(sym, object); - return; + return true; case COMMON * 16 + DYN_DEF: case WEAK_COMMON * 16 + DYN_DEF: @@ -297,7 +541,7 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_COMMON * 16 + DYN_DEF: // Ignore a dynamic definition if we already have a common // definition. - return; + return false; case DEF * 16 + DYN_WEAK_DEF: case WEAK_DEF * 16 + DYN_WEAK_DEF: @@ -305,15 +549,14 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_DEF * 16 + DYN_WEAK_DEF: // Ignore a weak dynamic definition if we already have a // definition. - return; + return false; case UNDEF * 16 + DYN_WEAK_DEF: case WEAK_UNDEF * 16 + DYN_WEAK_DEF: case DYN_UNDEF * 16 + DYN_WEAK_DEF: case DYN_WEAK_UNDEF * 16 + DYN_WEAK_DEF: // Use a weak dynamic definition if we have a reference. - to->override(sym, object); - return; + return true; case COMMON * 16 + DYN_WEAK_DEF: case WEAK_COMMON * 16 + DYN_WEAK_DEF: @@ -321,7 +564,7 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_COMMON * 16 + DYN_WEAK_DEF: // Ignore a weak dynamic definition if we already have a common // definition. - return; + return false; case DEF * 16 + UNDEF: case WEAK_DEF * 16 + UNDEF: @@ -329,21 +572,20 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_DEF * 16 + UNDEF: case UNDEF * 16 + UNDEF: // A new undefined reference tells us nothing. - return; + return false; case WEAK_UNDEF * 16 + UNDEF: case DYN_UNDEF * 16 + UNDEF: case DYN_WEAK_UNDEF * 16 + UNDEF: // A strong undef overrides a dynamic or weak undef. - to->override(sym, object); - return; + return true; case COMMON * 16 + UNDEF: case WEAK_COMMON * 16 + UNDEF: case DYN_COMMON * 16 + UNDEF: case DYN_WEAK_COMMON * 16 + UNDEF: // A new undefined reference tells us nothing. - return; + return false; case DEF * 16 + WEAK_UNDEF: case WEAK_DEF * 16 + WEAK_UNDEF: @@ -358,7 +600,7 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_COMMON * 16 + WEAK_UNDEF: case DYN_WEAK_COMMON * 16 + WEAK_UNDEF: // A new weak undefined reference tells us nothing. - return; + return false; case DEF * 16 + DYN_UNDEF: case WEAK_DEF * 16 + DYN_UNDEF: @@ -373,7 +615,7 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_COMMON * 16 + DYN_UNDEF: case DYN_WEAK_COMMON * 16 + DYN_UNDEF: // A new dynamic undefined reference tells us nothing. - return; + return false; case DEF * 16 + DYN_WEAK_UNDEF: case WEAK_DEF * 16 + DYN_WEAK_UNDEF: @@ -388,50 +630,46 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_COMMON * 16 + DYN_WEAK_UNDEF: case DYN_WEAK_COMMON * 16 + DYN_WEAK_UNDEF: // A new weak dynamic undefined reference tells us nothing. - return; + return false; case DEF * 16 + COMMON: // A common symbol does not override a definition. - return; + if (parameters->options().warn_common()) + Symbol_table::report_resolve_problem(false, + _("common '%s' overridden by " + "previous definition"), + to, defined, object); + return false; case WEAK_DEF * 16 + COMMON: case DYN_DEF * 16 + COMMON: case DYN_WEAK_DEF * 16 + COMMON: // A common symbol does override a weak definition or a dynamic // definition. - to->override(sym, object); - return; + return true; case UNDEF * 16 + COMMON: case WEAK_UNDEF * 16 + COMMON: case DYN_UNDEF * 16 + COMMON: case DYN_WEAK_UNDEF * 16 + COMMON: // A common symbol is a definition for a reference. - to->override(sym, object); - return; + return true; case COMMON * 16 + COMMON: // Set the size to the maximum. - if (sym.get_st_size() > to->symsize()) - to->set_symsize(sym.get_st_size()); - return; + *adjust_common_sizes = true; + return false; case WEAK_COMMON * 16 + COMMON: // I'm not sure just what a weak common symbol means, but // presumably it can be overridden by a regular common symbol. - to->override(sym, object); - return; + return true; case DYN_COMMON * 16 + COMMON: case DYN_WEAK_COMMON * 16 + COMMON: - { - // Use the real common symbol, but adjust the size if necessary. - typename Sized_symbol::Size_type symsize = to->symsize(); - to->override(sym, object); - if (to->symsize() < symsize) - to->set_symsize(symsize); - } - return; + // Use the real common symbol, but adjust the size if necessary. + *adjust_common_sizes = true; + return true; case DEF * 16 + WEAK_COMMON: case WEAK_DEF * 16 + WEAK_COMMON: @@ -439,15 +677,14 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_DEF * 16 + WEAK_COMMON: // Whatever a weak common symbol is, it won't override a // definition. - return; + return false; case UNDEF * 16 + WEAK_COMMON: case WEAK_UNDEF * 16 + WEAK_COMMON: case DYN_UNDEF * 16 + WEAK_COMMON: case DYN_WEAK_UNDEF * 16 + WEAK_COMMON: // A weak common symbol is better than an undefined symbol. - to->override(sym, object); - return; + return true; case COMMON * 16 + WEAK_COMMON: case WEAK_COMMON * 16 + WEAK_COMMON: @@ -455,7 +692,7 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_COMMON * 16 + WEAK_COMMON: // Ignore a weak common symbol in the presence of a real common // symbol. - return; + return false; case DEF * 16 + DYN_COMMON: case WEAK_DEF * 16 + DYN_COMMON: @@ -463,84 +700,284 @@ Symbol_table::resolve(Sized_symbol* to, case DYN_WEAK_DEF * 16 + DYN_COMMON: // Ignore a dynamic common symbol in the presence of a // definition. - return; + return false; case UNDEF * 16 + DYN_COMMON: case WEAK_UNDEF * 16 + DYN_COMMON: case DYN_UNDEF * 16 + DYN_COMMON: case DYN_WEAK_UNDEF * 16 + DYN_COMMON: // A dynamic common symbol is a definition of sorts. - to->override(sym, object); - return; + return true; case COMMON * 16 + DYN_COMMON: case WEAK_COMMON * 16 + DYN_COMMON: case DYN_COMMON * 16 + DYN_COMMON: case DYN_WEAK_COMMON * 16 + DYN_COMMON: // Set the size to the maximum. - if (sym.get_st_size() > to->symsize()) - to->set_symsize(sym.get_st_size()); - return; + *adjust_common_sizes = true; + return false; case DEF * 16 + DYN_WEAK_COMMON: case WEAK_DEF * 16 + DYN_WEAK_COMMON: case DYN_DEF * 16 + DYN_WEAK_COMMON: case DYN_WEAK_DEF * 16 + DYN_WEAK_COMMON: // A common symbol is ignored in the face of a definition. - return; + return false; case UNDEF * 16 + DYN_WEAK_COMMON: case WEAK_UNDEF * 16 + DYN_WEAK_COMMON: case DYN_UNDEF * 16 + DYN_WEAK_COMMON: case DYN_WEAK_UNDEF * 16 + DYN_WEAK_COMMON: // I guess a weak common symbol is better than a definition. - to->override(sym, object); - return; + return true; case COMMON * 16 + DYN_WEAK_COMMON: case WEAK_COMMON * 16 + DYN_WEAK_COMMON: case DYN_COMMON * 16 + DYN_WEAK_COMMON: case DYN_WEAK_COMMON * 16 + DYN_WEAK_COMMON: // Set the size to the maximum. - if (sym.get_st_size() > to->symsize()) - to->set_symsize(sym.get_st_size()); - return; + *adjust_common_sizes = true; + return false; + + default: + gold_unreachable(); + } +} +// Issue an error or warning due to symbol resolution. IS_ERROR +// indicates an error rather than a warning. MSG is the error +// message; it is expected to have a %s for the symbol name. TO is +// the existing symbol. DEFINED/OBJECT is where the new symbol was +// found. + +// FIXME: We should have better location information here. When the +// symbol is defined, we should be able to pull the location from the +// debug info if there is any. + +void +Symbol_table::report_resolve_problem(bool is_error, const char* msg, + const Symbol* to, Defined defined, + Object* object) +{ + std::string demangled(to->demangled_name()); + size_t len = strlen(msg) + demangled.length() + 10; + char* buf = new char[len]; + snprintf(buf, len, msg, demangled.c_str()); + + const char* objname; + switch (defined) + { + case OBJECT: + objname = object->name().c_str(); + break; + case COPY: + objname = _("COPY reloc"); + break; + case DEFSYM: + case UNDEFINED: + objname = _("command line"); + break; + case SCRIPT: + objname = _("linker script"); + break; + case PREDEFINED: + objname = _("linker defined"); + break; default: gold_unreachable(); } + + if (is_error) + gold_error("%s: %s", objname, buf); + else + gold_warning("%s: %s", objname, buf); + + delete[] buf; + + if (to->source() == Symbol::FROM_OBJECT) + objname = to->object()->name().c_str(); + else + objname = _("command line"); + gold_info("%s: %s: previous definition here", program_name, objname); +} + +// A special case of should_override which is only called for a strong +// defined symbol from a regular object file. This is used when +// defining special symbols. + +bool +Symbol_table::should_override_with_special(const Symbol* to, Defined defined) +{ + bool adjust_common_sizes; + unsigned int frombits = global_flag | regular_flag | def_flag; + bool ret = Symbol_table::should_override(to, frombits, defined, NULL, + &adjust_common_sizes); + gold_assert(!adjust_common_sizes); + return ret; +} + +// Override symbol base with a special symbol. + +void +Symbol::override_base_with_special(const Symbol* from) +{ + gold_assert(this->name_ == from->name_ || this->has_alias()); + + this->source_ = from->source_; + switch (from->source_) + { + case FROM_OBJECT: + this->u_.from_object = from->u_.from_object; + break; + case IN_OUTPUT_DATA: + this->u_.in_output_data = from->u_.in_output_data; + break; + case IN_OUTPUT_SEGMENT: + this->u_.in_output_segment = from->u_.in_output_segment; + break; + case IS_CONSTANT: + case IS_UNDEFINED: + break; + default: + gold_unreachable(); + break; + } + + this->override_version(from->version_); + this->type_ = from->type_; + this->binding_ = from->binding_; + this->override_visibility(from->visibility_); + this->nonvis_ = from->nonvis_; + + // Special symbols are always considered to be regular symbols. + this->in_reg_ = true; + + if (from->needs_dynsym_entry_) + this->needs_dynsym_entry_ = true; + if (from->needs_dynsym_value_) + this->needs_dynsym_value_ = true; + + // We shouldn't see these flags. If we do, we need to handle them + // somehow. + gold_assert(!from->is_forwarder_); + gold_assert(!from->has_plt_offset()); + gold_assert(!from->has_warning_); + gold_assert(!from->is_copied_from_dynobj_); + gold_assert(!from->is_forced_local_); +} + +// Override a symbol with a special symbol. + +template +void +Sized_symbol::override_with_special(const Sized_symbol* from) +{ + this->override_base_with_special(from); + this->value_ = from->value_; + this->symsize_ = from->symsize_; +} + +// Override TOSYM with the special symbol FROMSYM. This handles all +// aliases of TOSYM. + +template +void +Symbol_table::override_with_special(Sized_symbol* tosym, + const Sized_symbol* fromsym) +{ + tosym->override_with_special(fromsym); + if (tosym->has_alias()) + { + Symbol* sym = this->weak_aliases_[tosym]; + gold_assert(sym != NULL); + Sized_symbol* ssym = this->get_sized_symbol(sym); + do + { + ssym->override_with_special(fromsym); + sym = this->weak_aliases_[ssym]; + gold_assert(sym != NULL); + ssym = this->get_sized_symbol(sym); + } + while (ssym != tosym); + } + if (tosym->binding() == elfcpp::STB_LOCAL + || ((tosym->visibility() == elfcpp::STV_HIDDEN + || tosym->visibility() == elfcpp::STV_INTERNAL) + && (tosym->binding() == elfcpp::STB_GLOBAL + || tosym->binding() == elfcpp::STB_GNU_UNIQUE + || tosym->binding() == elfcpp::STB_WEAK) + && !parameters->options().relocatable())) + this->force_local(tosym); } // Instantiate the templates we need. We could use the configure // script to restrict this to only the ones needed for implemented // targets. +#ifdef HAVE_TARGET_32_LITTLE +template +void +Symbol_table::resolve<32, false>( + Sized_symbol<32>* to, + const elfcpp::Sym<32, false>& sym, + unsigned int st_shndx, + bool is_ordinary, + unsigned int orig_st_shndx, + Object* object, + const char* version); +#endif + +#ifdef HAVE_TARGET_32_BIG template void Symbol_table::resolve<32, true>( Sized_symbol<32>* to, const elfcpp::Sym<32, true>& sym, - Object* object); - + unsigned int st_shndx, + bool is_ordinary, + unsigned int orig_st_shndx, + Object* object, + const char* version); +#endif + +#ifdef HAVE_TARGET_64_LITTLE template void -Symbol_table::resolve<32, false>( - Sized_symbol<32>* to, - const elfcpp::Sym<32, false>& sym, - Object* object); - +Symbol_table::resolve<64, false>( + Sized_symbol<64>* to, + const elfcpp::Sym<64, false>& sym, + unsigned int st_shndx, + bool is_ordinary, + unsigned int orig_st_shndx, + Object* object, + const char* version); +#endif + +#ifdef HAVE_TARGET_64_BIG template void Symbol_table::resolve<64, true>( Sized_symbol<64>* to, const elfcpp::Sym<64, true>& sym, - Object* object); + unsigned int st_shndx, + bool is_ordinary, + unsigned int orig_st_shndx, + Object* object, + const char* version); +#endif + +#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) +template +void +Symbol_table::override_with_special<32>(Sized_symbol<32>*, + const Sized_symbol<32>*); +#endif +#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) template void -Symbol_table::resolve<64, false>( - Sized_symbol<64>* to, - const elfcpp::Sym<64, false>& sym, - Object* object); +Symbol_table::override_with_special<64>(Sized_symbol<64>*, + const Sized_symbol<64>*); +#endif } // End namespace gold.