this->symsize_ = 0;
}
+// Return true if SHNDX represents a common symbol.
+
+bool
+Symbol::is_common_shndx(unsigned int shndx)
+{
+ return (shndx == elfcpp::SHN_COMMON
+ || shndx == parameters->target().small_common_shndx()
+ || shndx == parameters->target().large_common_shndx());
+}
+
// Allocate a common symbol.
template<int size>
Symbol_table::Symbol_table(unsigned int count,
const Version_script_info& version_script)
: saw_undefined_(0), offset_(0), table_(count), namepool_(),
- forwarders_(), commons_(), tls_commons_(), forced_locals_(), warnings_(),
- version_script_(version_script), gc_(NULL)
+ forwarders_(), commons_(), tls_commons_(), small_commons_(),
+ large_commons_(), forced_locals_(), warnings_(),
+ version_script_(version_script), gc_(NULL), icf_(NULL)
{
namepool_.reserve(count);
}
return k1.first == k2.first && k1.second == k2.second;
}
+bool
+Symbol_table::is_section_folded(Object* obj, unsigned int shndx) const
+{
+ return (parameters->options().icf()
+ && this->icf_->is_section_folded(obj, shndx));
+}
+
// For symbols that have been listed with -u option, add them to the
// work list to avoid gc'ing them.
return name;
}
+// 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<int size, bool big_endian>
+void
+Symbol_table::define_default_version(Sized_symbol<size>* 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<size>* symdef;
+ symdef = this->get_sized_symbol<size>(pdef->second);
+ Symbol_table::resolve<size, big_endian>(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. ST_SHNDX is the symbol's
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)
- {
- // 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 (insdef.first->second->version() != NULL)
- {
- gold_assert(insdef.first->second->version() != version);
- def = false;
- }
- else if (ret->visibility() != elfcpp::STV_DEFAULT
- && insdef.first->second->is_from_dynobj())
- def = false;
- else if (insdef.first->second->visibility() != elfcpp::STV_DEFAULT
- && ret->is_from_dynobj())
- def = false;
- else
- {
- const Sized_symbol<size>* sym2;
- sym2 = this->get_sized_symbol<size>(insdef.first->second);
- Symbol_table::resolve<size, big_endian>(ret, sym2);
- this->make_forwarder(insdef.first->second, ret);
- insdef.first->second = ret;
- }
- }
- else
- def = false;
- }
+ this->define_default_version<size, big_endian>(ret, insdef.second,
+ insdef.first);
}
else
{
insdef.first->second = ret;
}
}
+
+ if (def)
+ ret->set_is_default();
}
// Record every time we see a new undefined symbol, to speed up
// allocation.
if (!was_common && ret->is_common())
{
- if (ret->type() != elfcpp::STT_TLS)
- this->commons_.push_back(ret);
- else
+ 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
&& !parameters->options().relocatable())
this->force_local(ret);
- if (def)
- ret->set_is_default();
return ret;
}
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<size, big_endian> sw(symbuf);
+ unsigned char nonvis = sym2.get_st_nonvis();
+ sw.put_st_other(elfcpp::STV_HIDDEN, nonvis);
+ }
+ }
+
Stringpool::Key name_key;
name = this->namepool_.add_with_length(name, namelen, true,
&name_key);
// 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<int size, bool big_endian>
Sized_symbol<size>*
Symbol_table::define_special_symbol(const char** pname, const char** pversion,
bool only_if_ref,
- Sized_symbol<size>** poldsym)
+ Sized_symbol<size>** poldsym,
+ bool *resolve_oldsym)
{
- Symbol* oldsym;
- Sized_symbol<size>* sym;
- bool add_to_table = false;
- typename Symbol_table_type::iterator add_loc = this->table_.end();
+ *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<size>* 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
{
version_key),
snull));
+ std::pair<typename Symbol_table_type::iterator, bool> 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<size>* soldsym =
+ this->get_sized_symbol<size>(oldsym);
+ this->define_default_version<size, big_endian>(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;
+ }
+ }
}
}
else
gold_assert(oldsym != NULL);
+ if (add_def_to_table)
+ add_def_loc->second = sym;
+
*poldsym = this->get_sized_symbol<size>(oldsym);
return sym;
{
Sized_symbol<size>* sym;
Sized_symbol<size>* 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<size, true>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
{
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
sym = this->define_special_symbol<size, false>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
if (Symbol_table::should_override_with_special(oldsym))
this->override_with_special(oldsym, sym);
- delete sym;
- return oldsym;
+
+ if (resolve_oldsym)
+ return sym;
+ else
+ {
+ delete sym;
+ return oldsym;
+ }
}
// Define a symbol based on an Output_segment.
{
Sized_symbol<size>* sym;
Sized_symbol<size>* 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<size, true>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
{
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
sym = this->define_special_symbol<size, false>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
if (Symbol_table::should_override_with_special(oldsym))
this->override_with_special(oldsym, sym);
- delete sym;
- return oldsym;
+
+ if (resolve_oldsym)
+ return sym;
+ else
+ {
+ delete sym;
+ return oldsym;
+ }
}
// Define a special symbol with a constant value. It is a multiple
{
Sized_symbol<size>* sym;
Sized_symbol<size>* 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<size, true>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
{
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
sym = this->define_special_symbol<size, false>(&name, &version,
- only_if_ref, &oldsym);
+ only_if_ref, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
if (force_override || Symbol_table::should_override_with_special(oldsym))
this->override_with_special(oldsym, sym);
- delete sym;
- return oldsym;
+
+ if (resolve_oldsym)
+ return sym;
+ else
+ {
+ delete sym;
+ return oldsym;
+ }
}
// Define a set of symbols in output sections.
Sized_symbol<size>* sym;
Sized_symbol<size>* 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<size, true>(&name, &version,
- false, &oldsym);
+ false, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
{
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
sym = this->define_special_symbol<size, false>(&name, &version,
- false, &oldsym);
+ false, &oldsym,
+ &resolve_oldsym);
#else
gold_unreachable();
#endif
bool is_ordinary;
unsigned int shndx = sym->shndx(&is_ordinary);
- // FIXME: We need some target specific support here.
if (!is_ordinary
&& shndx != elfcpp::SHN_ABS
- && shndx != elfcpp::SHN_COMMON)
+ && !Symbol::is_common_shndx(shndx))
{
gold_error(_("%s: unsupported symbol section 0x%x"),
sym->demangled_name().c_str(), shndx);
else if (shndx == elfcpp::SHN_UNDEF)
value = 0;
else if (!is_ordinary
- && (shndx == elfcpp::SHN_ABS || shndx == elfcpp::SHN_COMMON))
+ && (shndx == elfcpp::SHN_ABS
+ || Symbol::is_common_shndx(shndx)))
value = sym->value();
else
{
Relobj* relobj = static_cast<Relobj*>(symobj);
Output_section* os = relobj->output_section(shndx);
+ uint64_t secoff64 = relobj->output_section_offset(shndx);
- if (os == NULL)
+ if (this->is_section_folded(relobj, shndx))
+ {
+ gold_assert(os == NULL);
+ // Get the os of the section it is folded onto.
+ Section_id folded = this->icf_->get_folded_section(relobj,
+ shndx);
+ gold_assert(folded.first != NULL);
+ Relobj* folded_obj = reinterpret_cast<Relobj*>(folded.first);
+ os = folded_obj->output_section(folded.second);
+ gold_assert(os != NULL);
+ secoff64 = folded_obj->output_section_offset(folded.second);
+ }
+
+ if (os == NULL)
{
sym->set_symtab_index(-1U);
bool static_or_reloc = (parameters->doing_static_link() ||
return false;
}
- uint64_t secoff64 = relobj->output_section_offset(shndx);
if (secoff64 == -1ULL)
{
// The section needs special handling (e.g., a merge section).
+
value = os->output_address(relobj, shndx, sym->value());
}
else
bool is_ordinary;
unsigned int in_shndx = sym->shndx(&is_ordinary);
- // FIXME: We need some target specific support here.
if (!is_ordinary
&& in_shndx != elfcpp::SHN_ABS
- && in_shndx != elfcpp::SHN_COMMON)
+ && !Symbol::is_common_shndx(in_shndx))
{
gold_error(_("%s: unsupported symbol section 0x%x"),
sym->demangled_name().c_str(), in_shndx);
else if (in_shndx == elfcpp::SHN_UNDEF
|| (!is_ordinary
&& (in_shndx == elfcpp::SHN_ABS
- || in_shndx == elfcpp::SHN_COMMON)))
+ || Symbol::is_common_shndx(in_shndx))))
shndx = in_shndx;
else
{
Relobj* relobj = static_cast<Relobj*>(symobj);
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<Relobj*>(folded.first);
+ os = folded_obj->output_section(folded.second);
+ gold_assert(os != NULL);
+ }
gold_assert(os != NULL);
shndx = os->out_shndx();
projects / binutils-gdb.git / blobdiff