X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fsymtab.cc;h=01e000d874e7da7bec5377cb2fb3881968427ee5;hb=c55fe0967e9ec38c1e9d9d3ffc4db30a49323302;hp=054e07fba5e90cef3881612b3cd11ffd373c91c6;hpb=f0641a0b382db7403f04fab3d4e8fac25a2b68af;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/symtab.cc b/gold/symtab.cc index 054e07fba5..01e000d874 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -2,14 +2,15 @@ #include "gold.h" -#include #include #include #include #include "object.h" +#include "dynobj.h" #include "output.h" #include "target.h" +#include "workqueue.h" #include "symtab.h" namespace gold @@ -27,6 +28,8 @@ Symbol::init_fields(const char* name, const char* version, { this->name_ = name; this->version_ = version; + this->symtab_index_ = 0; + this->dynsym_index_ = 0; this->got_offset_ = 0; this->type_ = type; this->binding_ = binding; @@ -35,6 +38,8 @@ Symbol::init_fields(const char* name, const char* version, this->is_target_special_ = false; this->is_def_ = false; this->is_forwarder_ = false; + this->needs_dynsym_entry_ = false; + this->in_reg_ = false; this->in_dyn_ = false; this->has_got_offset_ = false; this->has_warning_ = false; @@ -51,8 +56,9 @@ Symbol::init_base(const char* name, const char* version, Object* object, sym.get_st_visibility(), sym.get_st_nonvis()); this->u_.from_object.object = object; // FIXME: Handle SHN_XINDEX. - this->u_.from_object.shnum = sym.get_st_shndx(); + this->u_.from_object.shndx = sym.get_st_shndx(); this->source_ = FROM_OBJECT; + this->in_reg_ = !object->is_dynamic(); this->in_dyn_ = object->is_dynamic(); } @@ -68,6 +74,7 @@ Symbol::init_base(const char* name, Output_data* od, elfcpp::STT type, this->u_.in_output_data.output_data = od; this->u_.in_output_data.offset_is_from_end = offset_is_from_end; this->source_ = IN_OUTPUT_DATA; + this->in_reg_ = true; } // Initialize the fields in the base class Symbol for a symbol defined @@ -82,6 +89,7 @@ Symbol::init_base(const char* name, Output_segment* os, elfcpp::STT type, this->u_.in_output_segment.output_segment = os; this->u_.in_output_segment.offset_base = offset_base; this->source_ = IN_OUTPUT_SEGMENT; + this->in_reg_ = true; } // Initialize the fields in the base class Symbol for a symbol defined @@ -94,6 +102,7 @@ Symbol::init_base(const char* name, elfcpp::STT type, { this->init_fields(name, NULL, type, binding, visibility, nonvis); this->source_ = CONSTANT; + this->in_reg_ = true; } // Initialize the fields in Sized_symbol for SYM in OBJECT. @@ -193,7 +202,8 @@ Symbol_table::Symbol_table_eq::operator()(const Symbol_table_key& k1, void Symbol_table::make_forwarder(Symbol* from, Symbol* to) { - assert(!from->is_forwarder() && !to->is_forwarder()); + gold_assert(from != to); + gold_assert(!from->is_forwarder() && !to->is_forwarder()); this->forwarders_[from] = to; from->set_forwarder(); } @@ -201,12 +211,12 @@ Symbol_table::make_forwarder(Symbol* from, Symbol* to) // Resolve the forwards from FROM, returning the real symbol. Symbol* -Symbol_table::resolve_forwards(Symbol* from) const +Symbol_table::resolve_forwards(const Symbol* from) const { - assert(from->is_forwarder()); - Unordered_map::const_iterator p = + gold_assert(from->is_forwarder()); + Unordered_map::const_iterator p = this->forwarders_.find(from); - assert(p != this->forwarders_.end()); + gold_assert(p != this->forwarders_.end()); return p->second; } @@ -243,8 +253,8 @@ Symbol_table::lookup(const char* name, const char* version) const template void -Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from - ACCEPT_SIZE_ENDIAN) +Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from, + const char* version ACCEPT_SIZE_ENDIAN) { unsigned char buf[elfcpp::Elf_sizes::sym_size]; elfcpp::Sym_write esym(buf); @@ -253,8 +263,8 @@ Symbol_table::resolve(Sized_symbol* to, const Sized_symbol* from esym.put_st_size(from->symsize()); esym.put_st_info(from->binding(), from->type()); esym.put_st_other(from->visibility(), from->nonvis()); - esym.put_st_shndx(from->shnum()); - Symbol_table::resolve(to, esym.sym(), from->object()); + esym.put_st_shndx(from->shndx()); + Symbol_table::resolve(to, esym.sym(), from->object(), version); } // Add one symbol from OBJECT to the symbol table. NAME is symbol @@ -318,12 +328,12 @@ Symbol_table::add_from_object(Object* object, // We already have an entry for NAME/VERSION. ret = this->get_sized_symbol SELECT_SIZE_NAME(size) (ins.first->second SELECT_SIZE(size)); - assert(ret != NULL); + gold_assert(ret != NULL); was_undefined = ret->is_undefined(); was_common = ret->is_common(); - Symbol_table::resolve(ret, sym, object); + Symbol_table::resolve(ret, sym, object, version); if (def) { @@ -333,7 +343,7 @@ Symbol_table::add_from_object(Object* object, // NAME/NULL point to NAME/VERSION. insdef.first->second = ret; } - else + else if (insdef.first->second != ret) { // This is the unfortunate case where we already have // entries for both NAME/VERSION and NAME/NULL. @@ -342,7 +352,7 @@ Symbol_table::add_from_object(Object* object, insdef.first->second SELECT_SIZE(size)); Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( - ret, sym2 SELECT_SIZE_ENDIAN(size, big_endian)); + ret, sym2, version SELECT_SIZE_ENDIAN(size, big_endian)); this->make_forwarder(insdef.first->second, ret); insdef.first->second = ret; } @@ -351,19 +361,19 @@ Symbol_table::add_from_object(Object* object, else { // This is the first time we have seen NAME/VERSION. - assert(ins.first->second == NULL); + gold_assert(ins.first->second == NULL); was_undefined = false; was_common = false; if (def && !insdef.second) { - // We already have an entry for NAME/NULL. Make - // NAME/VERSION point to it. + // We already have an entry for NAME/NULL. If we override + // it, then change it to NAME/VERSION. ret = this->get_sized_symbol SELECT_SIZE_NAME(size) ( insdef.first->second SELECT_SIZE(size)); - Symbol_table::resolve(ret, sym, object); + Symbol_table::resolve(ret, sym, object, version); ins.first->second = ret; } else @@ -400,7 +410,7 @@ Symbol_table::add_from_object(Object* object, { // This is the first time we have seen NAME/NULL. Point // it at the new entry for NAME/VERSION. - assert(insdef.second); + gold_assert(insdef.second); insdef.first->second = ret; } } @@ -423,8 +433,8 @@ Symbol_table::add_from_object(Object* object, template void -Symbol_table::add_from_object( - Relobj* object, +Symbol_table::add_from_relobj( + Sized_relobj* relobj, const unsigned char* syms, size_t count, const char* sym_names, @@ -435,10 +445,10 @@ Symbol_table::add_from_object( if (this->get_size() == 0) this->set_size(size); - if (size != this->get_size() || size != object->target()->get_size()) + if (size != this->get_size() || size != relobj->target()->get_size()) { fprintf(stderr, _("%s: %s: mixing 32-bit and 64-bit ELF objects\n"), - program_name, object->name().c_str()); + program_name, relobj->name().c_str()); gold_exit(false); } @@ -455,11 +465,13 @@ Symbol_table::add_from_object( { fprintf(stderr, _("%s: %s: bad global symbol name offset %u at %lu\n"), - program_name, object->name().c_str(), st_name, + program_name, relobj->name().c_str(), st_name, static_cast(i)); gold_exit(false); } + const char* name = sym_names + st_name; + // A symbol defined in a section which we are not including must // be treated as an undefined symbol. unsigned char symbuf[sym_size]; @@ -467,7 +479,7 @@ Symbol_table::add_from_object( unsigned int st_shndx = psym->get_st_shndx(); if (st_shndx != elfcpp::SHN_UNDEF && st_shndx < elfcpp::SHN_LORESERVE - && !object->is_section_included(st_shndx)) + && !relobj->is_section_included(st_shndx)) { memcpy(symbuf, p, sym_size); elfcpp::Sym_write sw(symbuf); @@ -475,8 +487,6 @@ Symbol_table::add_from_object( psym = &sym2; } - const char* name = sym_names + st_name; - // In an object file, an '@' in the name separates the symbol // name from the version name. If there are two '@' characters, // this is the default version. @@ -487,7 +497,7 @@ Symbol_table::add_from_object( { Stringpool::Key name_key; name = this->namepool_.add(name, &name_key); - res = this->add_from_object(object, name, name_key, NULL, 0, + res = this->add_from_object(relobj, name, name_key, NULL, 0, false, *psym); } else @@ -506,7 +516,7 @@ Symbol_table::add_from_object( Stringpool::Key ver_key; ver = this->namepool_.add(ver, &ver_key); - res = this->add_from_object(object, name, name_key, ver, ver_key, + res = this->add_from_object(relobj, name, name_key, ver, ver_key, def, *psym); } @@ -514,62 +524,193 @@ Symbol_table::add_from_object( } } +// Add all the symbols in a dynamic object to the hash table. + +template +void +Symbol_table::add_from_dynobj( + Sized_dynobj* dynobj, + const unsigned char* syms, + size_t count, + const char* sym_names, + size_t sym_name_size, + const unsigned char* versym, + size_t versym_size, + const std::vector* version_map) +{ + // We take the size from the first object we see. + if (this->get_size() == 0) + this->set_size(size); + + if (size != this->get_size() || size != dynobj->target()->get_size()) + { + fprintf(stderr, _("%s: %s: mixing 32-bit and 64-bit ELF objects\n"), + program_name, dynobj->name().c_str()); + gold_exit(false); + } + + if (versym != NULL && versym_size / 2 < count) + { + fprintf(stderr, _("%s: %s: too few symbol versions\n"), + program_name, dynobj->name().c_str()); + gold_exit(false); + } + + const int sym_size = elfcpp::Elf_sizes::sym_size; + + const unsigned char* p = syms; + const unsigned char* vs = versym; + for (size_t i = 0; i < count; ++i, p += sym_size, vs += 2) + { + elfcpp::Sym sym(p); + + // Ignore symbols with local binding. + if (sym.get_st_bind() == elfcpp::STB_LOCAL) + continue; + + unsigned int st_name = sym.get_st_name(); + if (st_name >= sym_name_size) + { + fprintf(stderr, _("%s: %s: bad symbol name offset %u at %lu\n"), + program_name, dynobj->name().c_str(), st_name, + static_cast(i)); + gold_exit(false); + } + + const char* name = sym_names + st_name; + + if (versym == NULL) + { + Stringpool::Key name_key; + name = this->namepool_.add(name, &name_key); + this->add_from_object(dynobj, name, name_key, NULL, 0, + false, sym); + continue; + } + + // Read the version information. + + unsigned int v = elfcpp::Swap<16, big_endian>::readval(vs); + + bool hidden = (v & elfcpp::VERSYM_HIDDEN) != 0; + v &= elfcpp::VERSYM_VERSION; + + if (v == static_cast(elfcpp::VER_NDX_LOCAL)) + { + // This symbol should not be visible outside the object. + continue; + } + + // At this point we are definitely going to add this symbol. + Stringpool::Key name_key; + name = this->namepool_.add(name, &name_key); + + if (v == static_cast(elfcpp::VER_NDX_GLOBAL)) + { + // This symbol does not have a version. + this->add_from_object(dynobj, name, name_key, NULL, 0, false, sym); + continue; + } + + if (v >= version_map->size()) + { + fprintf(stderr, + _("%s: %s: versym for symbol %zu out of range: %u\n"), + program_name, dynobj->name().c_str(), i, v); + gold_exit(false); + } + + const char* version = (*version_map)[v]; + if (version == NULL) + { + fprintf(stderr, _("%s: %s: versym for symbol %zu has no name: %u\n"), + program_name, dynobj->name().c_str(), i, v); + gold_exit(false); + } + + Stringpool::Key version_key; + version = this->namepool_.add(version, &version_key); + + // If this is an absolute symbol, and the version name and + // symbol name are the same, then this is the version definition + // symbol. These symbols exist to support using -u to pull in + // particular versions. We do not want to record a version for + // them. + if (sym.get_st_shndx() == elfcpp::SHN_ABS && name_key == version_key) + { + this->add_from_object(dynobj, name, name_key, NULL, 0, false, sym); + continue; + } + + const bool def = !hidden && sym.get_st_shndx() != elfcpp::SHN_UNDEF; + + this->add_from_object(dynobj, name, name_key, version, version_key, + def, sym); + } +} + // 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. template Sized_symbol* -Symbol_table::define_special_symbol(Target* target, const char* name, - bool only_if_ref +Symbol_table::define_special_symbol(const Target* target, const char* name, + const char* version, bool only_if_ref ACCEPT_SIZE_ENDIAN) { - assert(this->size_ == size); + gold_assert(this->size_ == size); Symbol* oldsym; Sized_symbol* sym; if (only_if_ref) { - oldsym = this->lookup(name, NULL); + oldsym = this->lookup(name, version); if (oldsym == NULL || !oldsym->is_undefined()) return NULL; sym = NULL; - // Canonicalize NAME. + // Canonicalize NAME and VERSION. name = oldsym->name(); + version = oldsym->version(); } else { - // Canonicalize NAME. + // Canonicalize NAME and VERSION. Stringpool::Key name_key; name = this->namepool_.add(name, &name_key); + Stringpool::Key version_key = 0; + if (version != NULL) + version = this->namepool_.add(version, &version_key); + Symbol* const snull = NULL; - const Stringpool::Key ver_key = 0; std::pair ins = - this->table_.insert(std::make_pair(std::make_pair(name_key, ver_key), + this->table_.insert(std::make_pair(std::make_pair(name_key, + version_key), snull)); if (!ins.second) { - // We already have a symbol table entry for NAME. + // We already have a symbol table entry for NAME/VERSION. oldsym = ins.first->second; - assert(oldsym != NULL); + gold_assert(oldsym != NULL); sym = NULL; } else { // We haven't seen this symbol before. - assert(ins.first->second == NULL); + gold_assert(ins.first->second == NULL); if (!target->has_make_symbol()) sym = new Sized_symbol(); else { - assert(target->get_size() == size); - 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 My_target; - My_target* sized_target = static_cast(target); + const My_target* sized_target = + static_cast(target); sym = sized_target->make_symbol(); if (sym == NULL) return NULL; @@ -582,14 +723,14 @@ Symbol_table::define_special_symbol(Target* target, const char* name, if (oldsym != NULL) { - assert(sym == NULL); + gold_assert(sym == NULL); sym = this->get_sized_symbol SELECT_SIZE_NAME(size) (oldsym SELECT_SIZE(size)); - assert(sym->source() == Symbol::FROM_OBJECT); - const int old_shnum = sym->shnum(); - if (old_shnum != elfcpp::SHN_UNDEF - && old_shnum != elfcpp::SHN_COMMON + gold_assert(sym->source() == Symbol::FROM_OBJECT); + const int old_shndx = sym->shndx(); + if (old_shndx != elfcpp::SHN_UNDEF + && old_shndx != elfcpp::SHN_COMMON && !sym->object()->is_dynamic()) { fprintf(stderr, "%s: linker defined: multiple definition of %s\n", @@ -607,9 +748,9 @@ Symbol_table::define_special_symbol(Target* target, const char* name, // Define a symbol based on an Output_data. -void -Symbol_table::define_in_output_data(Target* target, const char* name, - Output_data* od, +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, elfcpp::STV visibility, @@ -617,26 +758,29 @@ Symbol_table::define_in_output_data(Target* target, const char* name, bool offset_is_from_end, bool only_if_ref) { - assert(target->get_size() == this->size_); + gold_assert(target->get_size() == this->size_); if (this->size_ == 32) - this->do_define_in_output_data<32>(target, name, od, value, symsize, - type, binding, visibility, nonvis, - offset_is_from_end, only_if_ref); + return this->do_define_in_output_data<32>(target, name, version, od, value, + symsize, type, binding, + visibility, nonvis, + offset_is_from_end, only_if_ref); else if (this->size_ == 64) - this->do_define_in_output_data<64>(target, name, od, value, symsize, - type, binding, visibility, nonvis, - offset_is_from_end, only_if_ref); + return this->do_define_in_output_data<64>(target, name, version, od, value, + symsize, type, binding, + visibility, nonvis, + offset_is_from_end, only_if_ref); else - abort(); + gold_unreachable(); } // Define a symbol in an Output_data, sized version. template -void +Sized_symbol* Symbol_table::do_define_in_output_data( - Target* target, + const Target* target, const char* name, + const char* version, Output_data* od, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, @@ -651,25 +795,27 @@ Symbol_table::do_define_in_output_data( if (target->is_big_endian()) sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, true)); else sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, false)); if (sym == NULL) - return; + return NULL; sym->init(name, od, value, symsize, type, binding, visibility, nonvis, offset_is_from_end); + + return sym; } // Define a symbol based on an Output_segment. -void -Symbol_table::define_in_output_segment(Target* target, const char* name, - Output_segment* os, +Symbol* +Symbol_table::define_in_output_segment(const Target* target, const char* name, + const char* version, Output_segment* os, uint64_t value, uint64_t symsize, elfcpp::STT type, elfcpp::STB binding, elfcpp::STV visibility, @@ -677,26 +823,29 @@ Symbol_table::define_in_output_segment(Target* target, const char* name, Symbol::Segment_offset_base offset_base, bool only_if_ref) { - assert(target->get_size() == this->size_); + gold_assert(target->get_size() == this->size_); if (this->size_ == 32) - this->do_define_in_output_segment<32>(target, name, os, value, symsize, - type, binding, visibility, nonvis, - offset_base, only_if_ref); + return this->do_define_in_output_segment<32>(target, name, version, os, + value, symsize, type, binding, + visibility, nonvis, + offset_base, only_if_ref); else if (this->size_ == 64) - this->do_define_in_output_segment<64>(target, name, os, value, symsize, - type, binding, visibility, nonvis, - offset_base, only_if_ref); + return this->do_define_in_output_segment<64>(target, name, version, os, + value, symsize, type, binding, + visibility, nonvis, + offset_base, only_if_ref); else - abort(); + gold_unreachable(); } // Define a symbol in an Output_segment, sized version. template -void +Sized_symbol* Symbol_table::do_define_in_output_segment( - Target* target, + const Target* target, const char* name, + const char* version, Output_segment* os, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, @@ -711,50 +860,53 @@ Symbol_table::do_define_in_output_segment( if (target->is_big_endian()) sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, true)); else sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, false)); if (sym == NULL) - return; + return NULL; sym->init(name, os, value, symsize, type, binding, visibility, nonvis, offset_base); + + return sym; } // Define a special symbol with a constant value. It is a multiple // definition error if this symbol is already defined. -void -Symbol_table::define_as_constant(Target* target, const char* name, - uint64_t value, uint64_t symsize, - elfcpp::STT type, elfcpp::STB binding, - elfcpp::STV visibility, unsigned char nonvis, - bool only_if_ref) +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) { - assert(target->get_size() == this->size_); + gold_assert(target->get_size() == this->size_); if (this->size_ == 32) - this->do_define_as_constant<32>(target, name, value, symsize, - type, binding, visibility, nonvis, - only_if_ref); + return this->do_define_as_constant<32>(target, name, version, value, + symsize, type, binding, visibility, + nonvis, only_if_ref); else if (this->size_ == 64) - this->do_define_as_constant<64>(target, name, value, symsize, - type, binding, visibility, nonvis, - only_if_ref); + return this->do_define_as_constant<64>(target, name, version, value, + symsize, type, binding, visibility, + nonvis, only_if_ref); else - abort(); + gold_unreachable(); } // Define a symbol as a constant, sized version. template -void +Sized_symbol* Symbol_table::do_define_as_constant( - Target* target, + const Target* target, const char* name, + const char* version, typename elfcpp::Elf_types::Elf_Addr value, typename elfcpp::Elf_types::Elf_WXword symsize, elfcpp::STT type, @@ -767,35 +919,37 @@ Symbol_table::do_define_as_constant( if (target->is_big_endian()) sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, true)); else sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) ( - target, name, only_if_ref + target, name, version, only_if_ref SELECT_SIZE_ENDIAN(size, false)); if (sym == NULL) - return; + return NULL; sym->init(name, value, symsize, type, binding, visibility, nonvis); + + return sym; } // Define a set of symbols in output sections. void -Symbol_table::define_symbols(const Layout* layout, Target* target, int count, - const Define_symbol_in_section* p) +Symbol_table::define_symbols(const Layout* layout, const Target* target, + int count, const Define_symbol_in_section* p) { 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, os, p->value, p->size, - p->type, p->binding, p->visibility, - p->nonvis, p->offset_is_from_end, - p->only_if_ref); + this->define_in_output_data(target, 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); else - this->define_as_constant(target, p->name, 0, p->size, p->type, + this->define_as_constant(target, p->name, NULL, 0, p->size, p->type, p->binding, p->visibility, p->nonvis, p->only_if_ref); } @@ -804,8 +958,8 @@ Symbol_table::define_symbols(const Layout* layout, Target* target, int count, // Define a set of symbols in output segments. void -Symbol_table::define_symbols(const Layout* layout, Target* target, int count, - const Define_symbol_in_segment* p) +Symbol_table::define_symbols(const Layout* layout, const Target* target, + int count, const Define_symbol_in_segment* p) { for (int i = 0; i < count; ++i, ++p) { @@ -813,31 +967,86 @@ Symbol_table::define_symbols(const Layout* layout, Target* target, int count, p->segment_flags_set, p->segment_flags_clear); if (os != NULL) - this->define_in_output_segment(target, p->name, os, p->value, p->size, - p->type, p->binding, p->visibility, - p->nonvis, p->offset_base, - p->only_if_ref); + this->define_in_output_segment(target, p->name, NULL, os, p->value, + p->size, p->type, p->binding, + p->visibility, p->nonvis, + p->offset_base, p->only_if_ref); else - this->define_as_constant(target, p->name, 0, p->size, p->type, + this->define_as_constant(target, p->name, NULL, 0, p->size, p->type, p->binding, p->visibility, p->nonvis, p->only_if_ref); } } -// Set the final values for all the symbols. Record the file offset +// Set the dynamic symbol indexes. INDEX is the index of the first +// global dynamic symbol. Pointers to the symbols are stored into the +// vector SYMS. The names are added to DYNPOOL. This returns an +// updated dynamic symbol index. + +unsigned int +Symbol_table::set_dynsym_indexes(const General_options* options, + const Target* target, + unsigned int index, + std::vector* syms, + Stringpool* dynpool, + Versions* versions) +{ + for (Symbol_table_type::iterator p = this->table_.begin(); + p != this->table_.end(); + ++p) + { + Symbol* sym = p->second; + + // Note that SYM may already have a dynamic symbol index, since + // some symbols appear more than once in the symbol table, with + // and without a version. + + if (!sym->needs_dynsym_entry()) + sym->set_dynsym_index(-1U); + else if (!sym->has_dynsym_index()) + { + sym->set_dynsym_index(index); + ++index; + syms->push_back(sym); + dynpool->add(sym->name(), NULL); + + // Record any version information. + if (sym->version() != NULL) + versions->record_version(options, dynpool, sym); + } + } + + // Finish up the versions. In some cases this may add new dynamic + // symbols. + index = versions->finalize(target, 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. off_t -Symbol_table::finalize(off_t off, Stringpool* pool) +Symbol_table::finalize(unsigned int index, off_t off, off_t dynoff, + size_t dyn_global_index, size_t dyncount, + Stringpool* pool) { off_t ret; + gold_assert(index != 0); + this->first_global_index_ = index; + + this->dynamic_offset_ = dynoff; + this->first_dynamic_global_index_ = dyn_global_index; + this->dynamic_count_ = dyncount; + if (this->size_ == 32) - ret = this->sized_finalize<32>(off, pool); + ret = this->sized_finalize<32>(index, off, pool); else if (this->size_ == 64) - ret = this->sized_finalize<64>(off, pool); + ret = this->sized_finalize<64>(index, off, pool); else - abort(); + gold_unreachable(); // Now that we have the final symbol table, we can reliably note // which symbols should get warnings. @@ -852,20 +1061,35 @@ Symbol_table::finalize(off_t off, Stringpool* pool) template off_t -Symbol_table::sized_finalize(off_t off, Stringpool* pool) +Symbol_table::sized_finalize(unsigned index, off_t off, Stringpool* pool) { off = align_address(off, size >> 3); this->offset_ = off; + size_t orig_index = index; + const int sym_size = elfcpp::Elf_sizes::sym_size; - Symbol_table_type::iterator p = this->table_.begin(); - size_t count = 0; - while (p != this->table_.end()) + for (Symbol_table_type::iterator p = this->table_.begin(); + p != this->table_.end(); + ++p) { Sized_symbol* sym = static_cast*>(p->second); // FIXME: Here we need to decide which symbols should go into - // the output file. + // the output file, based on --strip. + + // 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; + + if (!sym->in_reg()) + { + gold_assert(!sym->has_symtab_index()); + sym->set_symtab_index(-1U); + gold_assert(sym->dynsym_index() == -1U); + continue; + } typename Sized_symbol::Value_type value; @@ -873,14 +1097,14 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool) { case Symbol::FROM_OBJECT: { - unsigned int shnum = sym->shnum(); + unsigned int shndx = sym->shndx(); // FIXME: We need some target specific support here. - if (shnum >= elfcpp::SHN_LORESERVE - && shnum != elfcpp::SHN_ABS) + if (shndx >= elfcpp::SHN_LORESERVE + && shndx != elfcpp::SHN_ABS) { fprintf(stderr, _("%s: %s: unsupported symbol section 0x%x\n"), - program_name, sym->name(), shnum); + program_name, sym->name(), shndx); gold_exit(false); } @@ -888,26 +1112,22 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool) if (symobj->is_dynamic()) { value = 0; - shnum = elfcpp::SHN_UNDEF; + shndx = elfcpp::SHN_UNDEF; } - else if (shnum == elfcpp::SHN_UNDEF) + else if (shndx == elfcpp::SHN_UNDEF) value = 0; - else if (shnum == elfcpp::SHN_ABS) + else if (shndx == elfcpp::SHN_ABS) value = sym->value(); else { Relobj* relobj = static_cast(symobj); off_t secoff; - Output_section* os = relobj->output_section(shnum, &secoff); + Output_section* os = relobj->output_section(shndx, &secoff); if (os == NULL) { - // We should be able to erase this symbol from the - // symbol table, but at least with gcc 4.0.2 - // std::unordered_map::erase doesn't appear to return - // the new iterator. - // p = this->table_.erase(p); - ++p; + sym->set_symtab_index(-1U); + gold_assert(sym->dynsym_index() == -1U); continue; } @@ -940,7 +1160,7 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool) value += os->filesz(); break; default: - abort(); + gold_unreachable(); } } break; @@ -950,17 +1170,17 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool) break; default: - abort(); + gold_unreachable(); } sym->set_value(value); + sym->set_symtab_index(index); pool->add(sym->name(), NULL); - ++count; + ++index; off += sym_size; - ++p; } - this->output_count_ = count; + this->output_count_ = index - orig_index; return off; } @@ -969,24 +1189,24 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool) void Symbol_table::write_globals(const Target* target, const Stringpool* sympool, - Output_file* of) const + const Stringpool* dynpool, Output_file* of) const { if (this->size_ == 32) { if (target->is_big_endian()) - this->sized_write_globals<32, true>(target, sympool, of); + this->sized_write_globals<32, true>(target, sympool, dynpool, of); else - this->sized_write_globals<32, false>(target, sympool, of); + this->sized_write_globals<32, false>(target, sympool, dynpool, of); } else if (this->size_ == 64) { if (target->is_big_endian()) - this->sized_write_globals<64, true>(target, sympool, of); + this->sized_write_globals<64, true>(target, sympool, dynpool, of); else - this->sized_write_globals<64, false>(target, sympool, of); + this->sized_write_globals<64, false>(target, sympool, dynpool, of); } else - abort(); + gold_unreachable(); } // Write out the global symbols. @@ -995,11 +1215,23 @@ template void Symbol_table::sized_write_globals(const Target*, const Stringpool* sympool, + const Stringpool* dynpool, Output_file* of) const { const int sym_size = elfcpp::Elf_sizes::sym_size; - unsigned char* psyms = of->get_output_view(this->offset_, - this->output_count_ * 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_; + unsigned char* dynamic_view; + if (this->dynamic_offset_ == 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(); @@ -1007,19 +1239,44 @@ Symbol_table::sized_write_globals(const Target*, { Sized_symbol* sym = static_cast*>(p->second); + unsigned int sym_index = sym->symtab_index(); + unsigned int dynsym_index; + if (dynamic_view == NULL) + dynsym_index = -1U; + else + dynsym_index = sym->dynsym_index(); + + if (sym_index == -1U && dynsym_index == -1U) + { + // This symbol is not included in the output file. + 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; switch (sym->source()) { case Symbol::FROM_OBJECT: { - unsigned int shnum = sym->shnum(); + unsigned int in_shndx = sym->shndx(); // FIXME: We need some target specific support here. - if (shnum >= elfcpp::SHN_LORESERVE - && shnum != elfcpp::SHN_ABS) + if (in_shndx >= elfcpp::SHN_LORESERVE + && in_shndx != elfcpp::SHN_ABS) { fprintf(stderr, _("%s: %s: unsupported symbol section 0x%x\n"), - program_name, sym->name(), sym->shnum()); + program_name, sym->name(), in_shndx); gold_exit(false); } @@ -1029,16 +1286,15 @@ Symbol_table::sized_write_globals(const Target*, // FIXME. shndx = elfcpp::SHN_UNDEF; } - else if (shnum == elfcpp::SHN_UNDEF || shnum == elfcpp::SHN_ABS) - shndx = shnum; + else if (in_shndx == elfcpp::SHN_UNDEF + || in_shndx == elfcpp::SHN_ABS) + shndx = in_shndx; else { Relobj* relobj = static_cast(symobj); off_t secoff; - Output_section* os = relobj->output_section(shnum, &secoff); - if (os == NULL) - continue; - + Output_section* os = relobj->output_section(in_shndx, &secoff); + gold_assert(os != NULL); shndx = os->out_shndx(); } } @@ -1057,22 +1313,103 @@ Symbol_table::sized_write_globals(const Target*, break; default: - abort(); + gold_unreachable(); } - elfcpp::Sym_write osym(ps); - osym.put_st_name(sympool->get_offset(sym->name())); - osym.put_st_value(sym->value()); - osym.put_st_size(sym->symsize()); - 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); + if (sym_index != -1U) + { + this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( + sym, shndx, sympool, ps + SELECT_SIZE_ENDIAN(size, big_endian)); + ps += sym_size; + } - ps += sym_size; + if (dynsym_index != -1U) + { + dynsym_index -= first_dynamic_global_index; + gold_assert(dynsym_index < dynamic_count); + unsigned char* pd = dynamic_view + (dynsym_index * sym_size); + this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) ( + sym, 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); +} + +// Write out the symbol SYM, in section SHNDX, to P. POOL is the +// strtab holding the name. + +template +void +Symbol_table::sized_write_symbol(Sized_symbol* sym, + unsigned int shndx, + const Stringpool* pool, + unsigned char* p + ACCEPT_SIZE_ENDIAN) const +{ + elfcpp::Sym_write osym(p); + osym.put_st_name(pool->get_offset(sym->name())); + osym.put_st_value(sym->value()); + osym.put_st_size(sym->symsize()); + 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); +} + +// Write out a section symbol. Return the update offset. + +void +Symbol_table::write_section_symbol(const Target* target, + const Output_section *os, + Output_file* of, + off_t offset) const +{ + if (this->size_ == 32) + { + if (target->is_big_endian()) + this->sized_write_section_symbol<32, true>(os, of, offset); + else + this->sized_write_section_symbol<32, false>(os, of, offset); } + else if (this->size_ == 64) + { + if (target->is_big_endian()) + this->sized_write_section_symbol<64, true>(os, of, offset); + else + this->sized_write_section_symbol<64, false>(os, of, offset); + } + else + gold_unreachable(); +} + +// Write out a section symbol, specialized for size and endianness. - of->write_output_view(this->offset_, this->output_count_ * sym_size, psyms); +template +void +Symbol_table::sized_write_section_symbol(const Output_section* os, + Output_file* of, + off_t offset) const +{ + const int sym_size = elfcpp::Elf_sizes::sym_size; + + unsigned char* pov = of->get_output_view(offset, sym_size); + + elfcpp::Sym_write osym(pov); + osym.put_st_name(0); + osym.put_st_value(os->address()); + osym.put_st_size(0); + osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, + elfcpp::STT_SECTION)); + osym.put_st_other(elfcpp::elf_st_other(elfcpp::STV_DEFAULT, 0)); + osym.put_st_shndx(os->out_shndx()); + + of->write_output_view(offset, sym_size, pov); } // Warnings functions. @@ -1111,10 +1448,13 @@ Warnings::note_warnings(Symbol_table* symtab) // 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. - const unsigned char* c; - off_t len; - c = p->second.object->section_contents(p->second.shndx, &len); - p->second.set_text(reinterpret_cast(c), len); + { + Task_locker_obj tl(*p->second.object); + const unsigned char* c; + off_t len; + c = p->second.object->section_contents(p->second.shndx, &len); + p->second.set_text(reinterpret_cast(c), len); + } } } } @@ -1123,11 +1463,11 @@ Warnings::note_warnings(Symbol_table* symtab) // symbol for which has a warning. void -Warnings::issue_warning(Symbol* sym, const std::string& location) const +Warnings::issue_warning(const Symbol* sym, const std::string& location) const { - assert(sym->has_warning()); + gold_assert(sym->has_warning()); Warning_table::const_iterator p = this->warnings_.find(sym->name()); - assert(p != this->warnings_.end()); + gold_assert(p != this->warnings_.end()); fprintf(stderr, _("%s: %s: warning: %s\n"), program_name, location.c_str(), p->second.text.c_str()); } @@ -1138,8 +1478,8 @@ Warnings::issue_warning(Symbol* sym, const std::string& location) const template void -Symbol_table::add_from_object<32, true>( - Relobj* object, +Symbol_table::add_from_relobj<32, true>( + Sized_relobj<32, true>* relobj, const unsigned char* syms, size_t count, const char* sym_names, @@ -1148,8 +1488,8 @@ Symbol_table::add_from_object<32, true>( template void -Symbol_table::add_from_object<32, false>( - Relobj* object, +Symbol_table::add_from_relobj<32, false>( + Sized_relobj<32, false>* relobj, const unsigned char* syms, size_t count, const char* sym_names, @@ -1158,8 +1498,8 @@ Symbol_table::add_from_object<32, false>( template void -Symbol_table::add_from_object<64, true>( - Relobj* object, +Symbol_table::add_from_relobj<64, true>( + Sized_relobj<64, true>* relobj, const unsigned char* syms, size_t count, const char* sym_names, @@ -1168,12 +1508,60 @@ Symbol_table::add_from_object<64, true>( template void -Symbol_table::add_from_object<64, false>( - Relobj* object, +Symbol_table::add_from_relobj<64, false>( + Sized_relobj<64, false>* relobj, const unsigned char* syms, size_t count, const char* sym_names, size_t sym_name_size, Symbol** sympointers); +template +void +Symbol_table::add_from_dynobj<32, true>( + Sized_dynobj<32, true>* dynobj, + const unsigned char* syms, + size_t count, + const char* sym_names, + size_t sym_name_size, + const unsigned char* versym, + size_t versym_size, + const std::vector* version_map); + +template +void +Symbol_table::add_from_dynobj<32, false>( + Sized_dynobj<32, false>* dynobj, + const unsigned char* syms, + size_t count, + const char* sym_names, + size_t sym_name_size, + const unsigned char* versym, + size_t versym_size, + const std::vector* version_map); + +template +void +Symbol_table::add_from_dynobj<64, true>( + Sized_dynobj<64, true>* dynobj, + const unsigned char* syms, + size_t count, + const char* sym_names, + size_t sym_name_size, + const unsigned char* versym, + size_t versym_size, + const std::vector* version_map); + +template +void +Symbol_table::add_from_dynobj<64, false>( + Sized_dynobj<64, false>* dynobj, + const unsigned char* syms, + size_t count, + const char* sym_names, + size_t sym_name_size, + const unsigned char* versym, + size_t versym_size, + const std::vector* version_map); + } // End namespace gold.