#include "object.h"
#include "output.h"
+#include "target.h"
#include "symtab.h"
namespace gold
from->set_forwarder();
}
+// Resolve the forwards from FROM, returning the real symbol.
+
Symbol*
Symbol_table::resolve_forwards(Symbol* from) const
{
return p->second;
}
+// Look up a symbol by name.
+
+Symbol*
+Symbol_table::lookup(const char* name, const char* version) const
+{
+ name = this->namepool_.find(name);
+ if (name == NULL)
+ return NULL;
+ if (version != NULL)
+ {
+ version = this->namepool_.find(version);
+ if (version == NULL)
+ return NULL;
+ }
+
+ Symbol_table_key key(name, version);
+ Symbol_table::Symbol_table_type::const_iterator p = this->table_.find(key);
+ if (p == this->table_.end())
+ return NULL;
+ return p->second;
+}
+
// Resolve a Symbol with another Symbol. This is only used in the
// unusual case where there are references to both an unversioned
// symbol and a symbol with a version, and we then discover that that
// version is the default version. Because this is unusual, we do
// this the slow way, by converting back to an ELF symbol.
-#ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS
-
template<int size, bool big_endian>
void
-Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from)
+Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from
+ ACCEPT_SIZE_ENDIAN)
{
unsigned char buf[elfcpp::Elf_sizes<size>::sym_size];
elfcpp::Sym_write<size, big_endian> esym(buf);
Symbol_table::resolve(to, esym.sym(), from->object());
}
-#else
-
-template<int size>
-void
-Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from,
- bool big_endian)
-{
- unsigned char buf[elfcpp::Elf_sizes<size>::sym_size];
- if (big_endian)
- {
- elfcpp::Sym_write<size, true> esym(buf);
- // We don't bother to set the st_name field.
- esym.put_st_value(from->value());
- esym.put_st_size(from->symsize());
- esym.put_st_info(from->binding(), from->type());
- esym.put_st_other(from->visibility(), from->other());
- esym.put_st_shndx(from->shnum());
- Symbol_table::resolve(to, esym.sym(), from->object());
- }
- else
- {
- elfcpp::Sym_write<size, false> esym(buf);
- // We don't bother to set the st_name field.
- esym.put_st_value(from->value());
- esym.put_st_size(from->symsize());
- esym.put_st_info(from->binding(), from->type());
- esym.put_st_other(from->visibility(), from->other());
- esym.put_st_shndx(from->shnum());
- Symbol_table::resolve(to, esym.sym(), from->object());
- }
-}
-
-#endif
-
// 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.
if (!ins.second)
{
// We already have an entry for NAME/VERSION.
-#ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS
- ret = this->get_sized_symbol<size>(ins.first->second);
-#else
- assert(size == this->get_size());
- ret = static_cast<Sized_symbol<size>*>(ins.first->second);
-#endif
+ ret = this->get_sized_symbol SELECT_SIZE_NAME (ins.first->second
+ SELECT_SIZE(size));
assert(ret != NULL);
Symbol_table::resolve(ret, sym, object);
// This is the unfortunate case where we already have
// entries for both NAME/VERSION and NAME/NULL.
const Sized_symbol<size>* sym2;
-#ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS
- sym2 = this->get_sized_symbol<size>(insdef.first->second);
- Symbol_table::resolve<size, big_endian>(ret, sym2);
-#else
- sym2 = static_cast<Sized_symbol<size>*>(insdef.first->second);
- Symbol_table::resolve(ret, sym2, big_endian);
-#endif
+ sym2 = this->get_sized_symbol SELECT_SIZE_NAME (
+ insdef.first->second
+ SELECT_SIZE(size));
+ Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME (
+ ret, sym2 SELECT_SIZE_ENDIAN(size, big_endian));
this->make_forwarder(insdef.first->second, ret);
insdef.first->second = ret;
}
{
// We already have an entry for NAME/NULL. Make
// NAME/VERSION point to it.
-#ifdef HAVE_MEMBER_TEMPLATE_SPECIFICATIONS
- ret = this->get_sized_symbol<size>(insdef.first->second);
-#else
- ret = static_cast<Sized_symbol<size>*>(insdef.first->second);
-#endif
+ ret = this->get_sized_symbol SELECT_SIZE_NAME (insdef.first->second
+ SELECT_SIZE(size));
Symbol_table::resolve(ret, sym, object);
ins.first->second = ret;
}
gold_exit(false);
}
+ const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
+
const unsigned char* p = reinterpret_cast<const unsigned char*>(syms);
- for (size_t i = 0; i < count; ++i)
+ for (size_t i = 0; i < count; ++i, p += sym_size)
{
elfcpp::Sym<size, big_endian> sym(p);
+ elfcpp::Sym<size, big_endian>* psym = &sym;
- unsigned int st_name = sym.get_st_name();
+ unsigned int st_name = psym->get_st_name();
if (st_name >= sym_name_size)
{
fprintf(stderr,
gold_exit(false);
}
+ // A symbol defined in a section which we are not including must
+ // be treated as an undefined symbol.
+ unsigned char symbuf[sym_size];
+ elfcpp::Sym<size, big_endian> sym2(symbuf);
+ 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))
+ {
+ memcpy(symbuf, p, sym_size);
+ elfcpp::Sym_write<size, big_endian> sw(symbuf);
+ sw.put_st_shndx(elfcpp::SHN_UNDEF);
+ psym = &sym2;
+ }
+
const char* name = sym_names + st_name;
// In an object file, an '@' in the name separates the symbol
if (ver == NULL)
{
name = this->namepool_.add(name);
- res = this->add_from_object(object, name, NULL, false, sym);
+ res = this->add_from_object(object, name, NULL, false, *psym);
}
else
{
++ver;
}
ver = this->namepool_.add(ver);
- res = this->add_from_object(object, name, ver, def, sym);
+ res = this->add_from_object(object, name, ver, def, *psym);
}
*sympointers++ = res;
-
- p += elfcpp::Elf_sizes<size>::sym_size;
}
}
{
if (this->size_ == 32)
return this->sized_finalize<32>(off, pool);
- else
+ else if (this->size_ == 64)
return this->sized_finalize<64>(off, pool);
+ else
+ abort();
}
// Set the final value for all the symbols.
off_t
Symbol_table::sized_finalize(off_t off, Stringpool* pool)
{
- off = (off + size - 1) & ~ (size - 1);
+ off = (off + (size >> 3) - 1) & ~ ((size >> 3) - 1);
this->offset_ = off;
const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
Symbol_table_type::iterator p = this->table_.begin();
+ size_t count = 0;
while (p != this->table_.end())
{
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.
- const Object::Map_to_output* mo =
- sym->object()->section_output_info(sym->shnum());
+ // FIXME: This is wrong.
+ if (sym->shnum() >= elfcpp::SHN_LORESERVE)
+ {
+ ++p;
+ continue;
+ }
+
+ off_t secoff;
+ Output_section* os = sym->object()->output_section(sym->shnum(),
+ &secoff);
- if (mo->output_section == NULL)
+ if (os == NULL)
{
// We should be able to erase this symbol from the symbol
// table, but at least with gcc 4.0.2
}
else
{
- sym->set_value(mo->output_section->address() + mo->offset);
+ sym->set_value(sym->value() + os->address() + secoff);
pool->add(sym->name());
++p;
+ ++count;
off += sym_size;
}
}
+ this->output_count_ = count;
+
return off;
}
+// Write out the global symbols.
+
+void
+Symbol_table::write_globals(const Target* target, const Stringpool* sympool,
+ Output_file* of) const
+{
+ if (this->size_ == 32)
+ {
+ if (target->is_big_endian())
+ this->sized_write_globals<32, true>(target, sympool, of);
+ else
+ this->sized_write_globals<32, false>(target, sympool, of);
+ }
+ else if (this->size_ == 64)
+ {
+ if (target->is_big_endian())
+ this->sized_write_globals<64, true>(target, sympool, of);
+ else
+ this->sized_write_globals<64, false>(target, sympool, of);
+ }
+ else
+ abort();
+}
+
+// Write out the global symbols.
+
+template<int size, bool big_endian>
+void
+Symbol_table::sized_write_globals(const Target*,
+ const Stringpool* sympool,
+ Output_file* of) const
+{
+ const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
+ unsigned char* psyms = of->get_output_view(this->offset_,
+ this->output_count_ * sym_size);
+ unsigned char* ps = psyms;
+ for (Symbol_table_type::const_iterator p = this->table_.begin();
+ p != this->table_.end();
+ ++p)
+ {
+ Sized_symbol<size>* sym = static_cast<Sized_symbol<size>*>(p->second);
+
+ // FIXME: This repeats sized_finalize().
+
+ // FIXME: This is wrong.
+ if (sym->shnum() >= elfcpp::SHN_LORESERVE)
+ continue;
+
+ off_t secoff;
+ Output_section* os = sym->object()->output_section(sym->shnum(),
+ &secoff);
+ if (os == NULL)
+ continue;
+
+ elfcpp::Sym_write<size, big_endian> 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->other()));
+ osym.put_st_shndx(os->shndx());
+
+ ps += sym_size;
+ }
+
+ of->write_output_view(this->offset_, this->output_count_ * sym_size, psyms);
+}
+
// Instantiate the templates we need. We could use the configure
// script to restrict this to only the ones needed for implemented
// targets.
projects / deliverable / binutils-gdb.git / blobdiff