// symtab.cc -- the gold symbol table
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
this->has_plt_offset_ = false;
this->has_warning_ = false;
this->is_copied_from_dynobj_ = false;
- this->needs_value_in_got_ = false;
+ this->is_forced_local_ = false;
}
// Return the demangled version of the symbol's name, but only
static std::string
demangle(const char* name)
{
- if (!parameters->demangle())
+ if (!parameters->options().demangle())
return name;
// cplus_demangle allocates memory for the result it returns,
this->in_reg_ = true;
}
+// Allocate a common symbol in the base.
+
+void
+Symbol::allocate_base_common(Output_data* od)
+{
+ gold_assert(this->is_common());
+ this->source_ = IN_OUTPUT_DATA;
+ this->u_.in_output_data.output_data = od;
+ this->u_.in_output_data.offset_is_from_end = false;
+}
+
// Initialize the fields in Sized_symbol for SYM in OBJECT.
template<int size>
this->symsize_ = symsize;
}
+// Allocate a common symbol.
+
+template<int size>
+void
+Sized_symbol<size>::allocate_common(Output_data* od, Value_type value)
+{
+ this->allocate_base_common(od);
+ this->value_ = value;
+}
+
// Return true if this symbol should be added to the dynamic symbol
// table.
if (this->needs_dynsym_entry())
return true;
+ // If the symbol was forced local in a version script, do not add it.
+ if (this->is_forced_local())
+ return false;
+
// 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;
{
// 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().shared() || parameters->options().relocatable())
return false;
// If the symbol is not from an object file, then it is defined, and
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 shndx = this->u_.from_object.shndx;
+ if (shndx != elfcpp::SHN_UNDEF && shndx < elfcpp::SHN_LORESERVE)
+ {
+ gold_assert(!this->u_.from_object.object->is_dynamic());
+ Relobj* relobj = static_cast<Relobj*>(this->u_.from_object.object);
+ section_offset_type dummy;
+ return relobj->output_section(shndx, &dummy);
+ }
+ return NULL;
+ }
+
+ case IN_OUTPUT_DATA:
+ return this->u_.in_output_data.output_data->output_section();
+
+ case IN_OUTPUT_SEGMENT:
+ case CONSTANT:
+ 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 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:
+ default:
+ gold_unreachable();
+ }
+}
+
// Class Symbol_table.
-Symbol_table::Symbol_table()
- : saw_undefined_(0), offset_(0), table_(), namepool_(),
- forwarders_(), commons_(), warnings_()
+Symbol_table::Symbol_table(unsigned int count,
+ const Version_script_info& version_script)
+ : saw_undefined_(0), offset_(0), table_(count), namepool_(),
+ forwarders_(), commons_(), forced_locals_(), warnings_(),
+ version_script_(version_script)
{
+ namepool_.reserve(count);
}
Symbol_table::~Symbol_table()
{
}
-// The hash function. The key is always canonicalized, so we use a
-// simple combination of the pointers.
+// The hash function. The key values are Stringpool keys.
-size_t
+inline size_t
Symbol_table::Symbol_table_hash::operator()(const Symbol_table_key& key) const
{
return key.first ^ key.second;
}
-// The symbol table key equality function. This is only called with
-// canonicalized name and version strings, so we can use pointer
-// comparison.
+// The symbol table key equality function. This is called with
+// Stringpool keys.
-bool
+inline bool
Symbol_table::Symbol_table_eq::operator()(const Symbol_table_key& k1,
const Symbol_table_key& k2) const
{
to->set_in_dyn();
}
+// Record that a symbol is forced to be local by a version script.
+
+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);
+}
+
// 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.
// NAME/NULL point to NAME/VERSION.
insdef.first->second = ret;
}
- else if (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.
+ // 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<size>* sym2;
sym2 = this->get_sized_symbol SELECT_SIZE_NAME(size) (
insdef.first->second
if (!was_common && ret->is_common())
this->commons_.push_back(ret);
+ ret->set_is_default(def);
return ret;
}
typename Sized_relobj<size, big_endian>::Symbols* sympointers)
{
gold_assert(size == relobj->target()->get_size());
- gold_assert(size == parameters->get_size());
+ gold_assert(size == parameters->target().get_size());
const int sym_size = elfcpp::Elf_sizes<size>::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)
{
// name from the version name. If there are two '@' characters,
// this is the default version.
const char* ver = strchr(name, '@');
+ 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 - name;
+ ++ver;
+ if (*ver == '@')
+ {
+ def = true;
+ ++ver;
+ }
+ }
+ else if (!version_script_.empty())
+ {
+ // The symbol name did not have a version, but
+ // the version script may assign a version anyway.
+ namelen = strlen(name);
+ def = true;
+ // Check the global: entries from the version script.
+ const std::string& version =
+ version_script_.get_symbol_version(name);
+ if (!version.empty())
+ ver = version.c_str();
+ // Check the local: entries from the version script
+ if (version_script_.symbol_is_local(name))
+ local = true;
+ }
+
+ if (just_symbols)
+ {
+ if (psym != &sym2)
+ memcpy(symbuf, p, sym_size);
+ elfcpp::Sym_write<size, big_endian> sw(symbuf);
+ sw.put_st_shndx(elfcpp::SHN_ABS);
+ if (st_shndx != elfcpp::SHN_UNDEF
+ && st_shndx < elfcpp::SHN_LORESERVE)
+ {
+ // 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(sym2.get_st_value()
+ + relobj->section_address(st_shndx));
+ }
+ psym = &sym2;
+ }
Sized_symbol<size>* res;
if (ver == NULL)
name = this->namepool_.add(name, true, &name_key);
res = this->add_from_object(relobj, name, name_key, NULL, 0,
false, *psym, sym);
+ if (local)
+ this->force_local(res);
}
else
{
Stringpool::Key name_key;
- name = this->namepool_.add_prefix(name, ver - name, &name_key);
-
- bool def = false;
- ++ver;
- if (*ver == '@')
- {
- def = true;
- ++ver;
- }
-
+ name = this->namepool_.add_with_length(name, namelen, true,
+ &name_key);
Stringpool::Key ver_key;
ver = this->namepool_.add(ver, true, &ver_key);
const std::vector<const char*>* version_map)
{
gold_assert(size == dynobj->target()->get_size());
- gold_assert(size == parameters->get_size());
+ 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)
{
{
elfcpp::Sym<size, big_endian> sym(p);
- // Ignore symbols with local binding.
- if (sym.get_st_bind() == elfcpp::STB_LOCAL)
+ // 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();
template<int size, bool big_endian>
Sized_symbol<size>*
-Symbol_table::define_special_symbol(const Target* target, const char** pname,
- const char** pversion, bool only_if_ref,
+Symbol_table::define_special_symbol(const char** pname, const char** pversion,
+ bool only_if_ref,
Sized_symbol<size>** poldsym
ACCEPT_SIZE_ENDIAN)
{
bool add_to_table = false;
typename Symbol_table_type::iterator add_loc = this->table_.end();
+ // If the caller didn't give us a version, see if we get one from
+ // the version script.
+ if (*pversion == NULL)
+ {
+ const std::string& v(this->version_script_.get_symbol_version(*pname));
+ if (!v.empty())
+ *pversion = v.c_str();
+ }
+
if (only_if_ref)
{
oldsym = this->lookup(*pname, *pversion);
}
}
- if (!target->has_make_symbol())
+ const Target& target = parameters->target();
+ if (!target.has_make_symbol())
sym = new Sized_symbol<size>();
else
{
- gold_assert(target->get_size() == size);
- gold_assert(target->is_big_endian() ? big_endian : !big_endian);
+ gold_assert(target.get_size() == size);
+ gold_assert(target.is_big_endian() ? big_endian : !big_endian);
typedef Sized_target<size, big_endian> My_target;
const My_target* sized_target =
- static_cast<const My_target*>(target);
+ static_cast<const My_target*>(&target);
sym = sized_target->make_symbol();
if (sym == NULL)
return NULL;
// 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* name,
+ const char* version,
+ Output_data* od,
+ uint64_t value,
+ uint64_t symsize,
+ elfcpp::STT type,
+ elfcpp::STB binding,
elfcpp::STV visibility,
unsigned char nonvis,
bool offset_is_from_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,
+ return this->do_define_in_output_data<32>(name, version, od,
value, symsize, type, binding,
visibility, nonvis,
offset_is_from_end,
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,
+ return this->do_define_in_output_data<64>(name, version, od,
value, symsize, type, binding,
visibility, nonvis,
offset_is_from_end,
template<int size>
Sized_symbol<size>*
Symbol_table::do_define_in_output_data(
- const Target* target,
const char* name,
const char* version,
Output_data* od,
Sized_symbol<size>* sym;
Sized_symbol<size>* 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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, true));
#else
gold_unreachable();
{
#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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, false));
#else
gold_unreachable();
sym->init(name, od, value, symsize, type, binding, visibility, nonvis,
offset_is_from_end);
- if (oldsym != NULL
- && Symbol_table::should_override_with_special(oldsym))
- this->override_with_special(oldsym, sym);
+ if (oldsym == NULL)
+ {
+ if (binding == elfcpp::STB_LOCAL
+ || this->version_script_.symbol_is_local(name))
+ this->force_local(sym);
+ return sym;
+ }
- return sym;
+ if (Symbol_table::should_override_with_special(oldsym))
+ this->override_with_special(oldsym, sym);
+ 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,
+Symbol_table::define_in_output_segment(const char* name,
const char* version, Output_segment* os,
- uint64_t value, uint64_t symsize,
- elfcpp::STT type, elfcpp::STB binding,
+ uint64_t value,
+ uint64_t symsize,
+ elfcpp::STT type,
+ elfcpp::STB binding,
elfcpp::STV visibility,
unsigned char nonvis,
Symbol::Segment_offset_base offset_base,
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,
+ return this->do_define_in_output_segment<32>(name, version, os,
value, symsize, type,
binding, visibility, nonvis,
offset_base, only_if_ref);
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,
+ return this->do_define_in_output_segment<64>(name, version, os,
value, symsize, type,
binding, visibility, nonvis,
offset_base, only_if_ref);
template<int size>
Sized_symbol<size>*
Symbol_table::do_define_in_output_segment(
- const Target* target,
const char* name,
const char* version,
Output_segment* os,
Sized_symbol<size>* sym;
Sized_symbol<size>* 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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, true));
#else
gold_unreachable();
{
#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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, false));
#else
gold_unreachable();
sym->init(name, os, value, symsize, type, binding, visibility, nonvis,
offset_base);
- if (oldsym != NULL
- && Symbol_table::should_override_with_special(oldsym))
- this->override_with_special(oldsym, sym);
+ if (oldsym == NULL)
+ {
+ if (binding == elfcpp::STB_LOCAL
+ || this->version_script_.symbol_is_local(name))
+ this->force_local(sym);
+ return sym;
+ }
- return sym;
+ if (Symbol_table::should_override_with_special(oldsym))
+ this->override_with_special(oldsym, sym);
+ 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* 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,
+ 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,
+ return this->do_define_as_constant<32>(name, version, value,
symsize, type, binding,
- visibility, nonvis, only_if_ref);
+ 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,
+ return this->do_define_as_constant<64>(name, version, value,
symsize, type, binding,
- visibility, nonvis, only_if_ref);
+ visibility, nonvis, only_if_ref,
+ force_override);
#else
gold_unreachable();
#endif
template<int size>
Sized_symbol<size>*
Symbol_table::do_define_as_constant(
- const Target* target,
const char* name,
const char* version,
typename elfcpp::Elf_types<size>::Elf_Addr value,
elfcpp::STB binding,
elfcpp::STV visibility,
unsigned char nonvis,
- bool only_if_ref)
+ bool only_if_ref,
+ bool force_override)
{
Sized_symbol<size>* sym;
Sized_symbol<size>* 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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, true));
#else
gold_unreachable();
{
#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
+ &name, &version, only_if_ref, &oldsym
SELECT_SIZE_ENDIAN(size, false));
#else
gold_unreachable();
if (sym == NULL)
return NULL;
- gold_assert(version == NULL || oldsym != NULL);
+ gold_assert(version == NULL || version == name || oldsym != NULL);
sym->init(name, value, symsize, type, binding, visibility, nonvis);
- if (oldsym != NULL
- && Symbol_table::should_override_with_special(oldsym))
- this->override_with_special(oldsym, sym);
+ if (oldsym == NULL)
+ {
+ if (binding == elfcpp::STB_LOCAL
+ || this->version_script_.symbol_is_local(name))
+ this->force_local(sym);
+ return sym;
+ }
- return sym;
+ if (force_override || Symbol_table::should_override_with_special(oldsym))
+ this->override_with_special(oldsym, sym);
+ 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)
{
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);
}
}
template<int size>
void
-Symbol_table::define_with_copy_reloc(const Target* target,
- Sized_symbol<size>* csym,
- Output_data* posd, uint64_t value)
+Symbol_table::define_with_copy_reloc(
+ Sized_symbol<size>* csym,
+ Output_data* posd,
+ typename elfcpp::Elf_types<size>::Elf_Addr value)
{
gold_assert(csym->is_from_dynobj());
gold_assert(!csym->is_copied_from_dynobj());
if (binding == elfcpp::STB_WEAK)
binding = elfcpp::STB_GLOBAL;
- this->define_in_output_data(target, csym->name(), csym->version(),
+ this->define_in_output_data(csym->name(), csym->version(),
posd, value, csym->symsize(),
csym->type(), binding,
csym->visibility(), csym->nonvis(),
// 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<Symbol*>* syms,
Stringpool* dynpool,
Versions* versions)
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);
}
}
// 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(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
return ret;
}
+// SYM is going into the symbol table at *PINDEX. Add the name to
+// POOL, update *PINDEX and *POFF.
+
+template<int size>
+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<size>::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<int size>
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<size>::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<size>(sym))
+ {
+ this->add_to_final_symtab<size>(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<size>* sym = static_cast<Sized_symbol<size>*>(p->second);
-
- // FIXME: Here we need to decide which symbols should go into
- // the output file, based on --strip.
+ Symbol* sym = p->second;
+ if (this->sized_finalize_symbol<size>(sym))
+ this->add_to_final_symtab<size>(sym, pool, &index, &off);
+ }
- // 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;
+ this->output_count_ = index - orig_index;
- if (!sym->in_reg())
- {
- gold_assert(!sym->has_symtab_index());
- sym->set_symtab_index(-1U);
- gold_assert(sym->dynsym_index() == -1U);
- continue;
- }
+ return off;
+}
- typename Sized_symbol<size>::Value_type value;
+// Finalize the symbol SYM. This returns true if the symbol should be
+// added to the symbol table, false otherwise.
- switch (sym->source())
- {
- case Symbol::FROM_OBJECT:
- {
- unsigned int shndx = sym->shndx();
+template<int size>
+bool
+Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
+{
+ Sized_symbol<size>* sym = static_cast<Sized_symbol<size>*>(unsized_sym);
- // FIXME: We need some target specific support here.
- if (shndx >= elfcpp::SHN_LORESERVE
- && shndx != elfcpp::SHN_ABS)
- {
- gold_error(_("%s: unsupported symbol section 0x%x"),
- sym->demangled_name().c_str(), shndx);
- shndx = elfcpp::SHN_UNDEF;
- }
+ // 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;
- Object* symobj = sym->object();
- if (symobj->is_dynamic())
- {
- value = 0;
- shndx = elfcpp::SHN_UNDEF;
- }
- else if (shndx == elfcpp::SHN_UNDEF)
- value = 0;
- else if (shndx == elfcpp::SHN_ABS)
- value = sym->value();
- else
- {
- Relobj* relobj = static_cast<Relobj*>(symobj);
- off_t secoff;
- Output_section* os = relobj->output_section(shndx, &secoff);
+ if (!sym->in_reg())
+ {
+ gold_assert(!sym->has_symtab_index());
+ sym->set_symtab_index(-1U);
+ gold_assert(sym->dynsym_index() == -1U);
+ return false;
+ }
- if (os == NULL)
- {
- sym->set_symtab_index(-1U);
- gold_assert(sym->dynsym_index() == -1U);
- continue;
- }
+ typename Sized_symbol<size>::Value_type value;
- value = sym->value() + os->address() + secoff;
- }
+ switch (sym->source())
+ {
+ case Symbol::FROM_OBJECT:
+ {
+ unsigned int shndx = sym->shndx();
+
+ // FIXME: We need some target specific support here.
+ if (shndx >= elfcpp::SHN_LORESERVE
+ && shndx != elfcpp::SHN_ABS
+ && shndx != elfcpp::SHN_COMMON)
+ {
+ gold_error(_("%s: unsupported symbol section 0x%x"),
+ sym->demangled_name().c_str(), shndx);
+ shndx = elfcpp::SHN_UNDEF;
}
- break;
- case Symbol::IN_OUTPUT_DATA:
+ Object* symobj = sym->object();
+ if (symobj->is_dynamic())
{
- Output_data* od = sym->output_data();
- value = sym->value() + od->address();
- if (sym->offset_is_from_end())
- value += od->data_size();
+ value = 0;
+ shndx = elfcpp::SHN_UNDEF;
}
- break;
-
- case Symbol::IN_OUTPUT_SEGMENT:
+ else if (shndx == elfcpp::SHN_UNDEF)
+ value = 0;
+ else if (shndx == elfcpp::SHN_ABS || shndx == elfcpp::SHN_COMMON)
+ value = sym->value();
+ else
{
- Output_segment* os = sym->output_segment();
- value = sym->value() + os->vaddr();
- switch (sym->offset_base())
+ Relobj* relobj = static_cast<Relobj*>(symobj);
+ section_offset_type secoff;
+ Output_section* os = relobj->output_section(shndx, &secoff);
+
+ if (os == NULL)
{
- case Symbol::SEGMENT_START:
- break;
- case Symbol::SEGMENT_END:
- value += os->memsz();
- break;
- case Symbol::SEGMENT_BSS:
- value += os->filesz();
- break;
- default:
- gold_unreachable();
+ sym->set_symtab_index(-1U);
+ gold_assert(sym->dynsym_index() == -1U);
+ return false;
}
+
+ if (sym->type() == elfcpp::STT_TLS)
+ value = sym->value() + os->tls_offset() + secoff;
+ else
+ value = sym->value() + os->address() + secoff;
}
- break;
+ }
+ break;
+
+ case Symbol::IN_OUTPUT_DATA:
+ {
+ Output_data* od = sym->output_data();
+ value = sym->value() + od->address();
+ if (sym->offset_is_from_end())
+ value += od->data_size();
+ }
+ break;
+
+ case Symbol::IN_OUTPUT_SEGMENT:
+ {
+ 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();
+ }
+ }
+ break;
- case Symbol::CONSTANT:
- value = sym->value();
- break;
+ case Symbol::CONSTANT:
+ value = sym->value();
+ break;
- default:
- gold_unreachable();
- }
+ default:
+ gold_unreachable();
+ }
- sym->set_value(value);
+ sym->set_value(value);
- 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;
- }
+ if (parameters->options().strip_all())
+ {
+ sym->set_symtab_index(-1U);
+ return false;
}
- this->output_count_ = index - orig_index;
-
- return off;
+ return true;
}
// Write out the global symbols.
const Stringpool* sympool,
const Stringpool* dynpool, 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>(input_objects, sympool,
+ dynpool, 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>(input_objects, sympool,
+ dynpool, 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>(input_objects, sympool,
+ dynpool, of);
+ break;
#endif
- }
+#ifdef HAVE_TARGET_64_BIG
+ case Parameters::TARGET_64_BIG:
+ this->sized_write_globals<64, true>(input_objects, sympool,
+ dynpool, of);
+ break;
+#endif
+ default:
+ gold_unreachable();
}
- else
- gold_unreachable();
}
// Write out the global symbols.
const Stringpool* dynpool,
Output_file* of) const
{
- const Target* const target = input_objects->target();
+ const Target& target = parameters->target();
const int sym_size = elfcpp::Elf_sizes<size>::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)
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();
+ typename elfcpp::Elf_types<size>::Elf_Addr sym_value = sym->value();
+ typename elfcpp::Elf_types<size>::Elf_Addr dynsym_value = sym_value;
switch (sym->source())
{
case Symbol::FROM_OBJECT:
// FIXME: We need some target specific support here.
if (in_shndx >= elfcpp::SHN_LORESERVE
- && in_shndx != elfcpp::SHN_ABS)
+ && in_shndx != elfcpp::SHN_ABS
+ && in_shndx != elfcpp::SHN_COMMON)
{
gold_error(_("%s: unsupported symbol section 0x%x"),
sym->demangled_name().c_str(), in_shndx);
if (symobj->is_dynamic())
{
if (sym->needs_dynsym_value())
- value = target->dynsym_value(sym);
+ dynsym_value = target.dynsym_value(sym);
shndx = elfcpp::SHN_UNDEF;
}
else if (in_shndx == elfcpp::SHN_UNDEF
- || in_shndx == elfcpp::SHN_ABS)
+ || in_shndx == elfcpp::SHN_ABS
+ || in_shndx == elfcpp::SHN_COMMON)
shndx = in_shndx;
else
{
Relobj* relobj = static_cast<Relobj*>(symobj);
- off_t secoff;
+ section_offset_type secoff;
Output_section* os = relobj->output_section(in_shndx,
&secoff);
gold_assert(os != NULL);
shndx = os->out_shndx();
+
+ // In object files symbol values are section
+ // relative.
+ if (parameters->options().relocatable())
+ sym_value -= os->address();
}
}
}
if (sym_index != -1U)
{
+ sym_index -= first_global_index;
+ gold_assert(sym_index < output_count);
+ unsigned char* ps = psyms + (sym_index * sym_size);
this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
- sym, sym->value(), shndx, sympool, ps
+ sym, sym_value, shndx, sympool, ps
SELECT_SIZE_ENDIAN(size, big_endian));
- ps += sym_size;
}
if (dynsym_index != -1U)
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
+ sym, dynsym_value, shndx, dynpool, pd
SELECT_SIZE_ENDIAN(size, big_endian));
}
}
- 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);
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()));
+ // A version script may have overridden the default binding.
+ if (sym->is_forced_local())
+ osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, sym->type()));
+ else
+ osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type()));
osym.put_st_other(elfcpp::elf_st_other(sym->visibility(), sym->nonvis()));
osym.put_st_shndx(shndx);
}
&& sym->object()->is_dynamic()
&& sym->shndx() == elfcpp::SHN_UNDEF
&& sym->binding() != elfcpp::STB_WEAK
- && !parameters->allow_shlib_undefined()
- && !input_objects->target()->is_defined_by_abi(sym)
+ && !parameters->options().allow_shlib_undefined()
+ && !parameters->target().is_defined_by_abi(sym)
&& !input_objects->found_in_system_library_directory(sym->object()))
{
// A very ugly cast.
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, 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, 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, of, offset);
+ break;
#endif
- }
+#ifdef HAVE_TARGET_64_BIG
+ case Parameters::TARGET_64_BIG:
+ this->sized_write_section_symbol<64, true>(os, of, offset);
+ break;
+#endif
+ default:
+ gold_unreachable();
}
- else
- gold_unreachable();
}
// Write out a section symbol, specialized for size and endianness.
of->write_output_view(offset, sym_size, pov);
}
+// Print statistical information to stderr. This is used for --stats.
+
+void
+Symbol_table::print_stats() const
+{
+#if defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP)
+ fprintf(stderr, _("%s: symbol table entries: %zu; buckets: %zu\n"),
+ program_name, this->table_.size(), this->table_.bucket_count());
+#else
+ fprintf(stderr, _("%s: symbol table entries: %zu\n"),
+ program_name, this->table_.size());
+#endif
+ this->namepool_.print_stats("symbol table stringpool");
+}
+
// We check for ODR violations by looking for symbols with the same
// name for which the debugging information reports that they were
// defined in different source locations. When comparing the source
// that case.
// This struct is used to compare line information, as returned by
-// Dwarf_line_info::one_addr2line. It imlements a < comparison
+// Dwarf_line_info::one_addr2line. It implements a < comparison
// operator used with std::set.
struct Odr_violation_compare
// but apparently different definitions (different source-file/line-no).
void
-Symbol_table::detect_odr_violations(const char* output_file_name) const
+Symbol_table::detect_odr_violations(const Task* task,
+ const char* output_file_name) const
{
for (Odr_map::const_iterator it = candidate_odr_violations_.begin();
it != candidate_odr_violations_.end();
++locs)
{
// We need to lock the object in order to read it. This
- // means that we can not run inside a Task. If we want to
- // run this in a 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.
- locs->object->lock();
+ // means that we have to run in a singleton Task. If we
+ // 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.
+ Task_lock_obj<Object> tl(task, locs->object);
std::string lineno = Dwarf_line_info::one_addr2line(
locs->object, locs->shndx, locs->offset);
- locs->object->unlock();
if (!lineno.empty())
line_nums.insert(lineno);
}
void
Warnings::add_warning(Symbol_table* symtab, const char* name, Object* obj,
- unsigned int shndx)
+ const std::string& warning)
{
name = symtab->canonicalize_name(name);
- this->warnings_[name].set(obj, shndx);
+ this->warnings_[name].set(obj, warning);
}
// Look through the warnings and mark the symbols for which we should
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_locker_obj<Object> tl(*p->second.object);
- const unsigned char* c;
- off_t len;
- c = p->second.object->section_contents(p->second.shndx, &len,
- false);
- p->second.set_text(reinterpret_cast<const char*>(c), len);
- }
- }
+ sym->set_has_warning();
}
}
// script to restrict this to only the ones needed for implemented
// targets.
+#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
+template
+void
+Sized_symbol<32>::allocate_common(Output_data*, Value_type);
+#endif
+
+#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
+template
+void
+Sized_symbol<64>::allocate_common(Output_data*, Value_type);
+#endif
+
#ifdef HAVE_TARGET_32_LITTLE
template
void
#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, uint64_t value);
+Symbol_table::define_with_copy_reloc<32>(
+ Sized_symbol<32>* sym,
+ Output_data* posd,
+ elfcpp::Elf_types<32>::Elf_Addr value);
#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, uint64_t value);
+Symbol_table::define_with_copy_reloc<64>(
+ Sized_symbol<64>* sym,
+ Output_data* posd,
+ elfcpp::Elf_types<64>::Elf_Addr value);
#endif
#ifdef HAVE_TARGET_32_LITTLE
projects / deliverable / binutils-gdb.git / blobdiff