// symtab.h -- the gold symbol table -*- C++ -*-
-// 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.
namespace gold
{
+class Mapfile;
class Object;
class Relobj;
template<int size, bool big_endian>
class Output_section;
class Output_segment;
class Output_file;
-class Target;
+class Output_symtab_xindex;
// The base class of an entry in the symbol table. The symbol table
// can have a lot of entries, so we don't want this class to big.
// section.
IN_OUTPUT_SEGMENT,
// Symbol value is constant.
- CONSTANT
+ IS_CONSTANT,
+ // Symbol is undefined.
+ IS_UNDEFINED
};
// When the source is IN_OUTPUT_SEGMENT, we need to describe what
return this->is_def_;
}
- // Set whether this version is the default for this symbol name.
+ // Set that this version is the default for this symbol name.
void
- set_is_default(bool def)
- { this->is_def_ = def; }
+ set_is_default()
+ { this->is_def_ = true; }
// Return the symbol source.
Source
// Return the index of the section in the input relocatable or
// dynamic object file.
unsigned int
- shndx() const
+ shndx(bool* is_ordinary) const
{
gold_assert(this->source_ == FROM_OBJECT);
+ *is_ordinary = this->is_ordinary_shndx_;
return this->u_.from_object.shndx;
}
// Return whether this symbol has an entry in the GOT section.
// For a TLS symbol, this GOT entry will hold its tp-relative offset.
bool
- has_got_offset() const
- { return this->has_got_offset_; }
+ has_got_offset(unsigned int got_type) const
+ { return this->got_offsets_.get_offset(got_type) != -1U; }
// Return the offset into the GOT section of this symbol.
unsigned int
- got_offset() const
+ got_offset(unsigned int got_type) const
{
- gold_assert(this->has_got_offset());
- return this->got_offset_;
+ unsigned int got_offset = this->got_offsets_.get_offset(got_type);
+ gold_assert(got_offset != -1U);
+ return got_offset;
}
// Set the GOT offset of this symbol.
void
- set_got_offset(unsigned int got_offset)
- {
- this->has_got_offset_ = true;
- this->got_offset_ = got_offset;
- }
-
- // Return whether this TLS symbol has an entry in the GOT section for
- // its module index or, if NEED_PAIR is true, has a pair of entries
- // for its module index and dtv-relative offset.
- bool
- has_tls_got_offset(bool need_pair) const
- {
- return (this->has_tls_mod_got_offset_
- && (!need_pair || this->has_tls_pair_got_offset_));
- }
-
- // Return the offset into the GOT section for this symbol's TLS module
- // index or, if NEED_PAIR is true, for the pair of entries for the
- // module index and dtv-relative offset.
- unsigned int
- tls_got_offset(bool need_pair) const
- {
- gold_assert(this->has_tls_got_offset(need_pair));
- return this->tls_mod_got_offset_;
- }
-
- // Set the GOT offset of this symbol.
- void
- set_tls_got_offset(unsigned int got_offset, bool have_pair)
- {
- this->has_tls_mod_got_offset_ = true;
- this->has_tls_pair_got_offset_ = have_pair;
- this->tls_mod_got_offset_ = got_offset;
- }
+ set_got_offset(unsigned int got_type, unsigned int got_offset)
+ { this->got_offsets_.set_offset(got_type, got_offset); }
// Return whether this symbol has an entry in the PLT section.
bool
bool
is_defined() const
{
- return (this->source_ != FROM_OBJECT
- || (this->shndx() != elfcpp::SHN_UNDEF
- && this->shndx() != elfcpp::SHN_COMMON));
+ bool is_ordinary;
+ if (this->source_ != FROM_OBJECT)
+ return this->source_ != IS_UNDEFINED;
+ unsigned int shndx = this->shndx(&is_ordinary);
+ return (is_ordinary
+ ? shndx != elfcpp::SHN_UNDEF
+ : shndx != elfcpp::SHN_COMMON);
}
// Return true if this symbol is from a dynamic object.
bool
is_undefined() const
{
- return this->source_ == FROM_OBJECT && this->shndx() == elfcpp::SHN_UNDEF;
+ bool is_ordinary;
+ return ((this->source_ == FROM_OBJECT
+ && this->shndx(&is_ordinary) == elfcpp::SHN_UNDEF
+ && is_ordinary)
+ || this->source_ == IS_UNDEFINED);
+ }
+
+ // Return whether this is a weak undefined symbol.
+ bool
+ is_weak_undefined() const
+ { return this->is_undefined() && this->binding() == elfcpp::STB_WEAK; }
+
+ // Return whether this is an absolute symbol.
+ bool
+ is_absolute() const
+ {
+ bool is_ordinary;
+ return ((this->source_ == FROM_OBJECT
+ && this->shndx(&is_ordinary) == elfcpp::SHN_ABS
+ && !is_ordinary)
+ || this->source_ == IS_CONSTANT);
}
// Return whether this is a common symbol.
bool
is_common() const
{
+ bool is_ordinary;
return (this->source_ == FROM_OBJECT
- && (this->shndx() == elfcpp::SHN_COMMON
+ && ((this->shndx(&is_ordinary) == elfcpp::SHN_COMMON
+ && !is_ordinary)
|| this->type_ == elfcpp::STT_COMMON));
}
// another object is preemptible.
gold_assert(!this->is_from_dynobj());
- return (this->visibility_ != elfcpp::STV_INTERNAL
- && this->visibility_ != elfcpp::STV_HIDDEN
- && this->visibility_ != elfcpp::STV_PROTECTED
- && parameters->output_is_shared()
- && !parameters->symbolic());
+ // It doesn't make sense to ask whether an undefined symbol
+ // is preemptible.
+ gold_assert(!this->is_undefined());
+
+ // If a symbol does not have default visibility, it can not be
+ // seen outside this link unit and therefore is not preemptible.
+ if (this->visibility_ != elfcpp::STV_DEFAULT)
+ return false;
+
+ // If this symbol has been forced to be a local symbol by a
+ // version script, then it is not visible outside this link unit
+ // and is not preemptible.
+ if (this->is_forced_local_)
+ return false;
+
+ // If we are not producing a shared library, then nothing is
+ // preemptible.
+ if (!parameters->options().shared())
+ return false;
+
+ // If the user used -Bsymbolic, then nothing is preemptible.
+ if (parameters->options().Bsymbolic())
+ return false;
+
+ // If the user used -Bsymbolic-functions, then functions are not
+ // preemptible. We explicitly check for not being STT_OBJECT,
+ // rather than for being STT_FUNC, because that is what the GNU
+ // linker does.
+ if (this->type() != elfcpp::STT_OBJECT
+ && parameters->options().Bsymbolic_functions())
+ return false;
+
+ // Otherwise the symbol is preemptible.
+ return true;
}
// Return true if this symbol is a function that needs a PLT entry.
// If the symbol is defined in a dynamic object or if it is subject
- // to pre-emption, we need to make a PLT entry.
+ // to pre-emption, we need to make a PLT entry. If we're doing a
+ // static link, we don't create PLT entries.
bool
needs_plt_entry() const
{
- return (this->type() == elfcpp::STT_FUNC
- && (this->is_from_dynobj() || this->is_preemptible()));
+ return (!parameters->doing_static_link()
+ && this->type() == elfcpp::STT_FUNC
+ && (this->is_from_dynobj()
+ || this->is_undefined()
+ || this->is_preemptible()));
}
// When determining whether a reference to a symbol needs a dynamic
bool
needs_dynamic_reloc(int flags) const
{
+ // No dynamic relocations in a static link!
+ if (parameters->doing_static_link())
+ return false;
+
+ // A reference to a weak undefined symbol from an executable should be
+ // statically resolved to 0, and does not need a dynamic relocation.
+ // This matches gnu ld behavior.
+ if (this->is_weak_undefined() && !parameters->options().shared())
+ return false;
+
+ // A reference to an absolute symbol does not need a dynamic relocation.
+ if (this->is_absolute())
+ return false;
+
// An absolute reference within a position-independent output file
// will need a dynamic relocation.
if ((flags & ABSOLUTE_REF)
- && parameters->output_is_position_independent())
+ && parameters->options().output_is_position_independent())
return true;
// A function call that can branch to a local PLT entry does not need
- // a dynamic relocation.
- if ((flags & FUNCTION_CALL) && this->has_plt_offset())
- return false;
-
- // A non-pic pc-relative function call in a shared library whose target
- // is defined in the same load module does not need a dynamic relocation.
- // Even if the target is preemptible, we will bind directly, since we
- // cannot use a PLT entry in this case.
+ // a dynamic relocation. A non-pic pc-relative function call in a
+ // shared library cannot use a PLT entry.
if ((flags & FUNCTION_CALL)
- && (flags & NON_PIC_REF)
- && this->is_defined()
- && parameters->output_is_shared())
+ && this->has_plt_offset()
+ && !((flags & NON_PIC_REF) && parameters->options().shared()))
return false;
// A reference to any PLT entry in a non-position-independent executable
// does not need a dynamic relocation.
- if (!parameters->output_is_position_independent()
+ if (!parameters->options().output_is_position_independent()
&& this->has_plt_offset())
return false;
// A reference to a symbol defined in a dynamic object or to a
// symbol that is preemptible will need a dynamic relocation.
- if (this->is_from_dynobj() || this->is_preemptible())
+ if (this->is_from_dynobj()
+ || this->is_undefined()
+ || this->is_preemptible())
return true;
// For all other cases, return FALSE.
// A reference to a symbol defined in a dynamic object or to a
// symbol that is preemptible can not use a RELATIVE relocaiton.
- if (this->is_from_dynobj() || this->is_preemptible())
+ if (this->is_from_dynobj()
+ || this->is_undefined()
+ || this->is_preemptible())
return false;
// For all other cases, return TRUE.
return true;
}
+ // Return the output section where this symbol is defined. Return
+ // NULL if the symbol has an absolute value.
+ Output_section*
+ output_section() const;
+
+ // 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
+ set_output_section(Output_section*);
+
// Return whether there should be a warning for references to this
// symbol.
bool
set_is_copied_from_dynobj()
{ this->is_copied_from_dynobj_ = true; }
+ // Return whether this symbol is forced to visibility STB_LOCAL
+ // by a "local:" entry in a version script.
+ bool
+ is_forced_local() const
+ { return this->is_forced_local_; }
+
+ // Mark this symbol as forced to STB_LOCAL visibility.
+ void
+ set_is_forced_local()
+ { this->is_forced_local_ = true; }
+
protected:
// Instances of this class should always be created at a specific
// size.
elfcpp::STT type, elfcpp::STB binding,
elfcpp::STV visibility, unsigned char nonvis);
- // Initialize fields from an ELF symbol in OBJECT.
+ // Initialize fields from an ELF symbol in OBJECT. ST_SHNDX is the
+ // section index, IS_ORDINARY is whether it is a normal section
+ // index rather than a special code.
template<int size, bool big_endian>
void
- init_base(const char *name, const char* version, Object* object,
- const elfcpp::Sym<size, big_endian>&);
+ init_base_object(const char *name, const char* version, Object* object,
+ const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx,
+ bool is_ordinary);
// Initialize fields for an Output_data.
void
- init_base(const char* name, Output_data*, elfcpp::STT, elfcpp::STB,
- elfcpp::STV, unsigned char nonvis, bool offset_is_from_end);
+ init_base_output_data(const char* name, const char* version, Output_data*,
+ elfcpp::STT, elfcpp::STB, elfcpp::STV,
+ unsigned char nonvis, bool offset_is_from_end);
// Initialize fields for an Output_segment.
void
- init_base(const char* name, Output_segment* os, elfcpp::STT type,
- elfcpp::STB binding, elfcpp::STV visibility,
- unsigned char nonvis, Segment_offset_base offset_base);
+ init_base_output_segment(const char* name, const char* version,
+ Output_segment* os, elfcpp::STT type,
+ elfcpp::STB binding, elfcpp::STV visibility,
+ unsigned char nonvis,
+ Segment_offset_base offset_base);
// Initialize fields for a constant.
void
- init_base(const char* name, elfcpp::STT type, elfcpp::STB binding,
- elfcpp::STV visibility, unsigned char nonvis);
+ init_base_constant(const char* name, const char* version, elfcpp::STT type,
+ elfcpp::STB binding, elfcpp::STV visibility,
+ unsigned char nonvis);
+
+ // Initialize fields for an undefined symbol.
+ void
+ init_base_undefined(const char* name, const char* version, elfcpp::STT type,
+ elfcpp::STB binding, elfcpp::STV visibility,
+ unsigned char nonvis);
// Override existing symbol.
template<int size, bool big_endian>
void
- override_base(const elfcpp::Sym<size, big_endian>&, Object* object,
- const char* version);
+ override_base(const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx,
+ bool is_ordinary, Object* object, const char* version);
// Override existing symbol with a special symbol.
void
override_base_with_special(const Symbol* from);
+ // Override symbol version.
+ void
+ override_version(const char* version);
+
// Allocate a common symbol by giving it a location in the output
// file.
void
unsigned int dynsym_index_;
// If this symbol has an entry in the GOT section (has_got_offset_
- // is true), this is the offset from the start of the GOT section.
- // For a TLS symbol, if has_tls_tpoff_got_offset_ is true, this
- // serves as the GOT offset for the GOT entry that holds its
- // TP-relative offset.
- unsigned int got_offset_;
-
- // If this is a TLS symbol and has an entry in the GOT section
- // for a module index or a pair of entries (module index,
- // dtv-relative offset), these are the offsets from the start
- // of the GOT section.
- unsigned int tls_mod_got_offset_;
- unsigned int tls_pair_got_offset_;
+ // is true), this holds the offset from the start of the GOT section.
+ // A symbol may have more than one GOT offset (e.g., when mixing
+ // modules compiled with two different TLS models), but will usually
+ // have at most one.
+ Got_offset_list got_offsets_;
// If this symbol has an entry in the PLT section (has_plt_offset_
// is true), then this is the offset from the start of the PLT
// section.
unsigned int plt_offset_;
- // Symbol type.
+ // Symbol type (bits 0 to 3).
elfcpp::STT type_ : 4;
- // Symbol binding.
+ // Symbol binding (bits 4 to 7).
elfcpp::STB binding_ : 4;
- // Symbol visibility.
+ // Symbol visibility (bits 8 to 9).
elfcpp::STV visibility_ : 2;
- // Rest of symbol st_other field.
+ // Rest of symbol st_other field (bits 10 to 15).
unsigned int nonvis_ : 6;
- // The type of symbol.
+ // The type of symbol (bits 16 to 18).
Source source_ : 3;
// True if this symbol always requires special target-specific
- // handling.
+ // handling (bit 19).
bool is_target_special_ : 1;
- // True if this is the default version of the symbol.
+ // True if this is the default version of the symbol (bit 20).
bool is_def_ : 1;
// True if this symbol really forwards to another symbol. This is
// used when we discover after the fact that two different entries
// never be set for a symbol found in the hash table, but may be set
// for a symbol found in the list of symbols attached to an Object.
// It forwards to the symbol found in the forwarders_ map of
- // Symbol_table.
+ // Symbol_table (bit 21).
bool is_forwarder_ : 1;
// True if the symbol has an alias in the weak_aliases table in
- // Symbol_table.
+ // Symbol_table (bit 22).
bool has_alias_ : 1;
- // True if this symbol needs to be in the dynamic symbol table.
+ // True if this symbol needs to be in the dynamic symbol table (bit
+ // 23).
bool needs_dynsym_entry_ : 1;
- // True if we've seen this symbol in a regular object.
+ // True if we've seen this symbol in a regular object (bit 24).
bool in_reg_ : 1;
- // True if we've seen this symbol in a dynamic object.
+ // True if we've seen this symbol in a dynamic object (bit 25).
bool in_dyn_ : 1;
- // True if the symbol has an entry in the GOT section.
- // For a TLS symbol, this GOT entry will hold its tp-relative offset.
- bool has_got_offset_ : 1;
- // True if the symbol has an entry in the GOT section for its
- // module index.
- bool has_tls_mod_got_offset_ : 1;
- // True if the symbol has a pair of entries in the GOT section for its
- // module index and dtv-relative offset.
- bool has_tls_pair_got_offset_ : 1;
- // True if the symbol has an entry in the PLT section.
+ // True if the symbol has an entry in the PLT section (bit 26).
bool has_plt_offset_ : 1;
// True if this is a dynamic symbol which needs a special value in
- // the dynamic symbol table.
+ // the dynamic symbol table (bit 27).
bool needs_dynsym_value_ : 1;
- // True if there is a warning for this symbol.
+ // True if there is a warning for this symbol (bit 28).
bool has_warning_ : 1;
// True if we are using a COPY reloc for this symbol, so that the
- // real definition lives in a dynamic object.
+ // real definition lives in a dynamic object (bit 29).
bool is_copied_from_dynobj_ : 1;
+ // True if this symbol was forced to local visibility by a version
+ // script (bit 30).
+ bool is_forced_local_ : 1;
+ // True if the field u_.from_object.shndx is an ordinary section
+ // index, not one of the special codes from SHN_LORESERVE to
+ // SHN_HIRESERVE.
+ bool is_ordinary_shndx_ : 1;
};
// The parts of a symbol which are size specific. Using a template
Sized_symbol()
{ }
- // Initialize fields from an ELF symbol in OBJECT.
+ // Initialize fields from an ELF symbol in OBJECT. ST_SHNDX is the
+ // section index, IS_ORDINARY is whether it is a normal section
+ // index rather than a special code.
template<bool big_endian>
void
- init(const char *name, const char* version, Object* object,
- const elfcpp::Sym<size, big_endian>&);
+ init_object(const char *name, const char* version, Object* object,
+ const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx,
+ bool is_ordinary);
// Initialize fields for an Output_data.
void
- init(const char* name, Output_data*, Value_type value, Size_type symsize,
- elfcpp::STT, elfcpp::STB, elfcpp::STV, unsigned char nonvis,
- bool offset_is_from_end);
+ init_output_data(const char* name, const char* version, Output_data*,
+ Value_type value, Size_type symsize, elfcpp::STT,
+ elfcpp::STB, elfcpp::STV, unsigned char nonvis,
+ bool offset_is_from_end);
// Initialize fields for an Output_segment.
void
- init(const char* name, Output_segment*, Value_type value, Size_type symsize,
- elfcpp::STT, elfcpp::STB, elfcpp::STV, unsigned char nonvis,
- Segment_offset_base offset_base);
+ init_output_segment(const char* name, const char* version, Output_segment*,
+ Value_type value, Size_type symsize, elfcpp::STT,
+ elfcpp::STB, elfcpp::STV, unsigned char nonvis,
+ Segment_offset_base offset_base);
// Initialize fields for a constant.
void
- init(const char* name, Value_type value, Size_type symsize,
- elfcpp::STT, elfcpp::STB, elfcpp::STV, unsigned char nonvis);
+ init_constant(const char* name, const char* version, Value_type value,
+ Size_type symsize, elfcpp::STT, elfcpp::STB, elfcpp::STV,
+ unsigned char nonvis);
+
+ // Initialize fields for an undefined symbol.
+ void
+ init_undefined(const char* name, const char* version, elfcpp::STT,
+ elfcpp::STB, elfcpp::STV, unsigned char nonvis);
// Override existing symbol.
template<bool big_endian>
void
- override(const elfcpp::Sym<size, big_endian>&, Object* object,
- const char* version);
+ override(const elfcpp::Sym<size, big_endian>&, unsigned int st_shndx,
+ bool is_ordinary, Object* object, const char* version);
// Override existing symbol with a special symbol.
void
~Symbol_table();
// Add COUNT external symbols from the relocatable object RELOBJ to
- // the symbol table. SYMS is the symbols, SYM_NAMES is their names,
- // SYM_NAME_SIZE is the size of SYM_NAMES. This sets SYMPOINTERS to
- // point to the symbols in the symbol table.
+ // the symbol table. SYMS is the symbols, SYMNDX_OFFSET is the
+ // offset in the symbol table of the first symbol, SYM_NAMES is
+ // their names, SYM_NAME_SIZE is the size of SYM_NAMES. This sets
+ // SYMPOINTERS to point to the symbols in the symbol table.
template<int size, bool big_endian>
void
add_from_relobj(Sized_relobj<size, big_endian>* relobj,
const unsigned char* syms, size_t count,
- const char* sym_names, size_t sym_name_size,
+ size_t symndx_offset, const char* sym_names,
+ size_t sym_name_size,
typename Sized_relobj<size, big_endian>::Symbols*);
// Add COUNT dynamic symbols from the dynamic object DYNOBJ to the
// Define a special symbol based on an Output_data. It is a
// multiple definition error if this symbol is already defined.
Symbol*
- define_in_output_data(const Target*, const char* name, const char* version,
+ define_in_output_data(const char* name, const char* version,
Output_data*, uint64_t value, uint64_t symsize,
elfcpp::STT type, elfcpp::STB binding,
elfcpp::STV visibility, unsigned char nonvis,
// Define a special symbol based on an Output_segment. It is a
// multiple definition error if this symbol is already defined.
Symbol*
- define_in_output_segment(const Target*, const char* name,
- const char* version, Output_segment*,
- uint64_t value, uint64_t symsize,
+ define_in_output_segment(const char* name, const char* version,
+ Output_segment*, uint64_t value, uint64_t symsize,
elfcpp::STT type, elfcpp::STB binding,
elfcpp::STV visibility, unsigned char nonvis,
Symbol::Segment_offset_base, bool only_if_ref);
// Define a special symbol with a constant value. It is a multiple
// definition error if this symbol is already defined.
Symbol*
- define_as_constant(const Target*, const char* name, const char* version,
+ 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);
+ unsigned char nonvis, bool only_if_ref,
+ bool force_override);
- // Define a set of symbols in output sections.
+ // Define a set of symbols in output sections. If ONLY_IF_REF is
+ // true, only define them if they are referenced.
void
- define_symbols(const Layout*, const Target*, int count,
- const Define_symbol_in_section*);
+ define_symbols(const Layout*, int count, const Define_symbol_in_section*,
+ bool only_if_ref);
- // Define a set of symbols in output segments.
+ // Define a set of symbols in output segments. If ONLY_IF_REF is
+ // true, only defined them if they are referenced.
void
- define_symbols(const Layout*, const Target*, int count,
- const Define_symbol_in_segment*);
+ define_symbols(const Layout*, int count, const Define_symbol_in_segment*,
+ bool only_if_ref);
// Define SYM using a COPY reloc. POSD is the Output_data where the
// symbol should be defined--typically a .dyn.bss section. VALUE is
// the offset within POSD.
template<int size>
void
- define_with_copy_reloc(const Target*, Sized_symbol<size>* sym,
- Output_data* posd,
+ define_with_copy_reloc(Sized_symbol<size>* sym, Output_data* posd,
typename elfcpp::Elf_types<size>::Elf_Addr);
// Look up a symbol.
// Return the sized version of a symbol in this table.
template<int size>
Sized_symbol<size>*
- get_sized_symbol(Symbol* ACCEPT_SIZE) const;
+ get_sized_symbol(Symbol*) const;
template<int size>
const Sized_symbol<size>*
- get_sized_symbol(const Symbol* ACCEPT_SIZE) const;
+ get_sized_symbol(const Symbol*) const;
// Return the count of undefined symbols seen.
int
// Allocate the common symbols
void
- allocate_commons(const General_options&, Layout*);
+ allocate_commons(Layout*, Mapfile*);
// Add a warning for symbol NAME in object OBJ. WARNING is the text
// of the warning.
void
detect_odr_violations(const Task*, const char* output_file_name) const;
+ // Add any undefined symbols named on the command line to the symbol
+ // table.
+ void
+ add_undefined_symbols_from_command_line();
+
// SYM is defined using a COPY reloc. Return the dynamic object
// where the original definition was found.
Dynobj*
// the vector. The names are stored into the Stringpool. This
// returns an updated dynamic symbol index.
unsigned int
- set_dynsym_indexes(const Target*, unsigned int index,
- std::vector<Symbol*>*, Stringpool*, Versions*);
+ set_dynsym_indexes(unsigned int index, std::vector<Symbol*>*,
+ Stringpool*, Versions*);
// Finalize the symbol table after we have set the final addresses
// of all the input sections. This sets the final symbol indexes,
- // values and adds the names to *POOL. INDEX is the index of the
- // first global symbol. OFF is the file offset of the global symbol
- // table, DYNOFF is the offset of the globals in the dynamic symbol
- // table, DYN_GLOBAL_INDEX is the index of the first global dynamic
- // symbol, and DYNCOUNT is the number of global dynamic symbols.
- // This records the parameters, and returns the new file offset.
+ // values and adds the names to *POOL. *PLOCAL_SYMCOUNT is the
+ // index of the first global symbol. OFF is the file offset of the
+ // global symbol table, DYNOFF is the offset of the globals in the
+ // dynamic symbol table, DYN_GLOBAL_INDEX is the index of the first
+ // global dynamic symbol, and DYNCOUNT is the number of global
+ // dynamic symbols. This records the parameters, and returns the
+ // new file offset. It updates *PLOCAL_SYMCOUNT if it created any
+ // local symbols.
off_t
- finalize(unsigned int index, off_t off, off_t dynoff,
- size_t dyn_global_index, size_t dyncount, Stringpool* pool);
+ finalize(off_t off, off_t dynoff, size_t dyn_global_index, size_t dyncount,
+ Stringpool* pool, unsigned int *plocal_symcount);
// Write out the global symbols.
void
write_globals(const Input_objects*, const Stringpool*, const Stringpool*,
+ Output_symtab_xindex*, Output_symtab_xindex*,
Output_file*) const;
// Write out a section symbol. Return the updated offset.
void
- write_section_symbol(const Output_section*, Output_file*, off_t) const;
+ write_section_symbol(const Output_section*, Output_symtab_xindex*,
+ Output_file*, off_t) const;
// Dump statistical information to stderr.
void
Symbol_table(const Symbol_table&);
Symbol_table& operator=(const Symbol_table&);
+ // The type of the list of common symbols.
+ typedef std::vector<Symbol*> Commons_type;
+
// Make FROM a forwarder symbol to TO.
void
make_forwarder(Symbol* from, Symbol* to);
add_from_object(Object*, const char *name, Stringpool::Key name_key,
const char *version, Stringpool::Key version_key,
bool def, const elfcpp::Sym<size, big_endian>& sym,
- const elfcpp::Sym<size, big_endian>& orig_sym);
+ unsigned int st_shndx, bool is_ordinary,
+ unsigned int orig_st_shndx);
// Resolve symbols.
template<int size, bool big_endian>
void
resolve(Sized_symbol<size>* to,
const elfcpp::Sym<size, big_endian>& sym,
- const elfcpp::Sym<size, big_endian>& orig_sym,
+ unsigned int st_shndx, bool is_ordinary,
+ unsigned int orig_st_shndx,
Object*, const char* version);
template<int size, bool big_endian>
void
resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from,
- const char* version ACCEPT_SIZE_ENDIAN);
+ const char* version);
+
+ // Record that a symbol is forced to be local by a version script.
+ void
+ force_local(Symbol*);
+
+ // Adjust NAME and *NAME_KEY for wrapping.
+ const char*
+ wrap_symbol(Object* object, const char*, Stringpool::Key* name_key);
// Whether we should override a symbol, based on flags in
// resolve.cc.
void
override(Sized_symbol<size>* tosym,
const elfcpp::Sym<size, big_endian>& fromsym,
+ unsigned int st_shndx, bool is_ordinary,
Object* object, const char* version);
// Whether we should override a symbol with a special symbol which
// Define a special symbol.
template<int size, bool big_endian>
Sized_symbol<size>*
- define_special_symbol(const Target* target, const char** pname,
- const char** pversion, bool only_if_ref,
- Sized_symbol<size>** poldsym ACCEPT_SIZE_ENDIAN);
+ define_special_symbol(const char** pname, const char** pversion,
+ bool only_if_ref, Sized_symbol<size>** poldsym);
// Define a symbol in an Output_data, sized version.
template<int size>
Sized_symbol<size>*
- do_define_in_output_data(const Target*, const char* name,
- const char* version, Output_data*,
+ do_define_in_output_data(const char* name, const char* version, Output_data*,
typename elfcpp::Elf_types<size>::Elf_Addr value,
typename elfcpp::Elf_types<size>::Elf_WXword ssize,
elfcpp::STT type, elfcpp::STB binding,
template<int size>
Sized_symbol<size>*
do_define_in_output_segment(
- const Target*, const char* name, const char* version, Output_segment* os,
+ const char* name, const char* version, Output_segment* os,
typename elfcpp::Elf_types<size>::Elf_Addr value,
typename elfcpp::Elf_types<size>::Elf_WXword ssize,
elfcpp::STT type, elfcpp::STB binding,
template<int size>
Sized_symbol<size>*
do_define_as_constant(
- const Target*, const char* name, const char* version,
+ const char* name, const char* version,
typename elfcpp::Elf_types<size>::Elf_Addr value,
typename elfcpp::Elf_types<size>::Elf_WXword ssize,
elfcpp::STT type, elfcpp::STB binding,
elfcpp::STV visibility, unsigned char nonvis,
- bool only_if_ref);
+ bool only_if_ref, bool force_override);
+
+ // Add any undefined symbols named on the command line to the symbol
+ // table, sized version.
+ template<int size>
+ void
+ do_add_undefined_symbols_from_command_line();
// Allocate the common symbols, sized version.
template<int size>
void
- do_allocate_commons(const General_options&, Layout*);
+ do_allocate_commons(Layout*, Mapfile*);
+
+ // Allocate the common symbols from one list.
+ template<int size>
+ void
+ do_allocate_commons_list(Layout*, bool is_tls, Commons_type*, Mapfile*);
// Implement detect_odr_violations.
template<int size, bool big_endian>
// Finalize symbols specialized for size.
template<int size>
off_t
- sized_finalize(unsigned int, off_t, Stringpool*);
+ sized_finalize(off_t, Stringpool*, unsigned int*);
+
+ // Finalize a symbol. Return whether it should be added to the
+ // symbol table.
+ template<int size>
+ bool
+ sized_finalize_symbol(Symbol*);
+
+ // Add a symbol the final symtab by setting its index.
+ template<int size>
+ void
+ add_to_final_symtab(Symbol*, Stringpool*, unsigned int* pindex, off_t* poff);
// Write globals specialized for size and endianness.
template<int size, bool big_endian>
void
sized_write_globals(const Input_objects*, const Stringpool*,
- const Stringpool*, Output_file*) const;
+ const Stringpool*, Output_symtab_xindex*,
+ Output_symtab_xindex*, Output_file*) const;
// Write out a symbol to P.
template<int size, bool big_endian>
sized_write_symbol(Sized_symbol<size>*,
typename elfcpp::Elf_types<size>::Elf_Addr value,
unsigned int shndx,
- const Stringpool*, unsigned char* p
- ACCEPT_SIZE_ENDIAN) const;
+ const Stringpool*, unsigned char* p) const;
// Possibly warn about an undefined symbol from a dynamic object.
void
// Write out a section symbol, specialized for size and endianness.
template<int size, bool big_endian>
void
- sized_write_section_symbol(const Output_section*, Output_file*, off_t) const;
+ sized_write_section_symbol(const Output_section*, Output_symtab_xindex*,
+ Output_file*, off_t) const;
// The type of the symbol hash table.
typedef Unordered_map<Symbol_table_key, Symbol*, Symbol_table_hash,
Symbol_table_eq> Symbol_table_type;
- // The type of the list of common symbols.
- typedef std::vector<Symbol*> Commons_type;
+ // The type of the list of symbols which have been forced local.
+ typedef std::vector<Symbol*> Forced_locals;
// A map from symbols with COPY relocs to the dynamic objects where
// they are defined.
// write the table.
off_t offset_;
// The number of global symbols we want to write out.
- size_t output_count_;
+ unsigned int output_count_;
// The file offset of the global dynamic symbols, or 0 if none.
off_t dynamic_offset_;
// The index of the first global dynamic symbol.
unsigned int first_dynamic_global_index_;
// The number of global dynamic symbols, or 0 if none.
- off_t dynamic_count_;
+ unsigned int dynamic_count_;
// The symbol hash table.
Symbol_table_type table_;
// A pool of symbol names. This is used for all global symbols.
// symbol is no longer a common symbol. It may also have become a
// forwarder.
Commons_type commons_;
+ // This is like the commons_ field, except that it holds TLS common
+ // symbols.
+ Commons_type tls_commons_;
+ // A list of symbols which have been forced to be local. We don't
+ // expect there to be very many of them, so we keep a list of them
+ // rather than walking the whole table to find them.
+ Forced_locals forced_locals_;
// Manage symbol warnings.
Warnings warnings_;
// Manage potential One Definition Rule (ODR) violations.
template<int size>
Sized_symbol<size>*
-Symbol_table::get_sized_symbol(Symbol* sym ACCEPT_SIZE) const
+Symbol_table::get_sized_symbol(Symbol* sym) const
{
- gold_assert(size == parameters->get_size());
+ gold_assert(size == parameters->target().get_size());
return static_cast<Sized_symbol<size>*>(sym);
}
template<int size>
const Sized_symbol<size>*
-Symbol_table::get_sized_symbol(const Symbol* sym ACCEPT_SIZE) const
+Symbol_table::get_sized_symbol(const Symbol* sym) const
{
- gold_assert(size == parameters->get_size());
+ gold_assert(size == parameters->target().get_size());
return static_cast<const Sized_symbol<size>*>(sym);
}
projects / deliverable / binutils-gdb.git / blobdiff