#include <cerrno>
#include <cstring>
-#include <cassert>
+#include <cstdarg>
#include "target-select.h"
#include "layout.h"
namespace gold
{
-// Class Sized_relobj.
+// Class Object.
-template<int size, bool big_endian>
-Sized_relobj<size, big_endian>::Sized_relobj(
- const std::string& name,
- Input_file* input_file,
- off_t offset,
- const elfcpp::Ehdr<size, big_endian>& ehdr)
- : Relobj(name, input_file, offset),
- section_headers_(NULL),
- flags_(ehdr.get_e_flags()),
- shoff_(ehdr.get_e_shoff()),
- shstrndx_(0),
- symtab_shnum_(0),
- local_symbol_count_(0),
- output_local_symbol_count_(0),
- symbols_(NULL),
- local_symbol_offset_(0),
- values_(NULL)
+// Set the target based on fields in the ELF file header.
+
+void
+Object::set_target(int machine, int size, bool big_endian, int osabi,
+ int abiversion)
{
- if (ehdr.get_e_ehsize() != This::ehdr_size)
- {
- fprintf(stderr, _("%s: %s: bad e_ehsize field (%d != %d)\n"),
- program_name, this->name().c_str(), ehdr.get_e_ehsize(),
- This::ehdr_size);
- gold_exit(false);
- }
- if (ehdr.get_e_shentsize() != This::shdr_size)
+ Target* target = select_target(machine, size, big_endian, osabi, abiversion);
+ if (target == NULL)
{
- fprintf(stderr, _("%s: %s: bad e_shentsize field (%d != %d)\n"),
- program_name, this->name().c_str(), ehdr.get_e_shentsize(),
- This::shdr_size);
+ fprintf(stderr, _("%s: %s: unsupported ELF machine number %d\n"),
+ program_name, this->name().c_str(), machine);
gold_exit(false);
}
+ this->target_ = target;
}
-template<int size, bool big_endian>
-Sized_relobj<size, big_endian>::~Sized_relobj()
+// Report an error for the elfcpp::Elf_file interface.
+
+void
+Object::error(const char* format, ...)
{
+ va_list args;
+
+ fprintf(stderr, "%s: %s: ", program_name, this->name().c_str());
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
+ putc('\n', stderr);
+
+ gold_exit(false);
}
-// Read the section header for section SHNUM.
+// Return a view of the contents of a section.
-template<int size, bool big_endian>
-inline const unsigned char*
-Sized_relobj<size, big_endian>::section_header(unsigned int shnum)
+const unsigned char*
+Object::section_contents(unsigned int shndx, off_t* plen)
{
- assert(shnum < this->shnum());
- off_t symtabshdroff = this->shoff_ + shnum * This::shdr_size;
- return this->get_view(symtabshdroff, This::shdr_size);
+ Location loc(this->do_section_contents(shndx));
+ *plen = loc.data_size;
+ return this->get_view(loc.file_offset, loc.data_size);
}
-// Return the name of section SHNUM. The object must already be
-// locked.
+// Read the section data into SD. This is code common to Sized_relobj
+// and Sized_dynobj, so we put it into Object.
template<int size, bool big_endian>
-std::string
-Sized_relobj<size, big_endian>::do_section_name(unsigned int shnum)
+void
+Object::read_section_data(elfcpp::Elf_file<size, big_endian, Object>* elf_file,
+ Read_symbols_data* sd)
{
+ const int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;
+
+ // Read the section headers.
+ const off_t shoff = elf_file->shoff();
+ const unsigned int shnum = this->shnum();
+ sd->section_headers = this->get_lasting_view(shoff, shnum * shdr_size);
+
// Read the section names.
- typename This::Shdr shdrnames(this->section_header(this->shstrndx_));
- const unsigned char* pnamesu = this->get_view(shdrnames.get_sh_offset(),
- shdrnames.get_sh_size());
- const char* pnames = reinterpret_cast<const char*>(pnamesu);
+ const unsigned char* pshdrs = sd->section_headers->data();
+ const unsigned char* pshdrnames = pshdrs + elf_file->shstrndx() * shdr_size;
+ typename elfcpp::Shdr<size, big_endian> shdrnames(pshdrnames);
- typename This::Shdr shdr(this->section_header(shnum));
- if (shdr.get_sh_name() >= shdrnames.get_sh_size())
+ if (shdrnames.get_sh_type() != elfcpp::SHT_STRTAB)
{
fprintf(stderr,
- _("%s: %s: bad section name offset for section %u: %lu\n"),
- program_name, this->name().c_str(), shnum,
- static_cast<unsigned long>(shdr.get_sh_name()));
+ _("%s: %s: section name section has wrong type: %u\n"),
+ program_name, this->name().c_str(),
+ static_cast<unsigned int>(shdrnames.get_sh_type()));
gold_exit(false);
}
- return std::string(pnames + shdr.get_sh_name());
+ sd->section_names_size = shdrnames.get_sh_size();
+ sd->section_names = this->get_lasting_view(shdrnames.get_sh_offset(),
+ sd->section_names_size);
+}
+
+// If NAME is the name of a special .gnu.warning section, arrange for
+// the warning to be issued. SHNDX is the section index. Return
+// whether it is a warning section.
+
+bool
+Object::handle_gnu_warning_section(const char* name, unsigned int shndx,
+ Symbol_table* symtab)
+{
+ const char warn_prefix[] = ".gnu.warning.";
+ const int warn_prefix_len = sizeof warn_prefix - 1;
+ if (strncmp(name, warn_prefix, warn_prefix_len) == 0)
+ {
+ symtab->add_warning(name + warn_prefix_len, this, shndx);
+ return true;
+ }
+ return false;
}
-// Return a view of the contents of section SHNUM. The object does
-// not have to be locked.
+// Class Sized_relobj.
template<int size, bool big_endian>
-const unsigned char*
-Sized_relobj<size, big_endian>::do_section_contents(unsigned int shnum,
- off_t* plen)
+Sized_relobj<size, big_endian>::Sized_relobj(
+ const std::string& name,
+ Input_file* input_file,
+ off_t offset,
+ const elfcpp::Ehdr<size, big_endian>& ehdr)
+ : Relobj(name, input_file, offset),
+ elf_file_(this, ehdr),
+ symtab_shndx_(-1U),
+ local_symbol_count_(0),
+ output_local_symbol_count_(0),
+ symbols_(NULL),
+ local_symbol_offset_(0),
+ local_values_()
{
- Task_locker_obj<Object> tl(*this);
+}
- typename This::Shdr shdr(this->section_header(shnum));
- *plen = shdr.get_sh_size();
- return this->get_view(shdr.get_sh_offset(), shdr.get_sh_size());
+template<int size, bool big_endian>
+Sized_relobj<size, big_endian>::~Sized_relobj()
+{
}
-// Set up an object file bsaed on the file header. This sets up the
+// Set up an object file based on the file header. This sets up the
// target and reads the section information.
template<int size, bool big_endian>
Sized_relobj<size, big_endian>::setup(
const elfcpp::Ehdr<size, big_endian>& ehdr)
{
- int machine = ehdr.get_e_machine();
- Target* target = select_target(machine, size, big_endian,
- ehdr.get_e_ident()[elfcpp::EI_OSABI],
- ehdr.get_e_ident()[elfcpp::EI_ABIVERSION]);
- if (target == NULL)
- {
- fprintf(stderr, _("%s: %s: unsupported ELF machine number %d\n"),
- program_name, this->name().c_str(), machine);
- gold_exit(false);
- }
- this->set_target(target);
+ this->set_target(ehdr.get_e_machine(), size, big_endian,
+ ehdr.get_e_ident()[elfcpp::EI_OSABI],
+ ehdr.get_e_ident()[elfcpp::EI_ABIVERSION]);
- unsigned int shnum = ehdr.get_e_shnum();
- unsigned int shstrndx = ehdr.get_e_shstrndx();
- if ((shnum == 0 || shstrndx == elfcpp::SHN_XINDEX)
- && this->shoff_ != 0)
- {
- typename This::Shdr shdr(this->section_header(0));
- if (shnum == 0)
- shnum = shdr.get_sh_size();
- if (shstrndx == elfcpp::SHN_XINDEX)
- shstrndx = shdr.get_sh_link();
- }
+ const unsigned int shnum = this->elf_file_.shnum();
this->set_shnum(shnum);
- this->shstrndx_ = shstrndx;
-
- if (shnum == 0)
- return;
-
- // We store the section headers in a File_view until do_read_symbols.
- this->section_headers_ = this->get_lasting_view(this->shoff_,
- shnum * This::shdr_size);
+}
- // Find the SHT_SYMTAB section. The ELF standard says that maybe in
- // the future there can be more than one SHT_SYMTAB section. Until
- // somebody figures out how that could work, we assume there is only
- // one.
- const unsigned char* p = this->section_headers_->data();
+// Find the SHT_SYMTAB section, given the section headers. The ELF
+// standard says that maybe in the future there can be more than one
+// SHT_SYMTAB section. Until somebody figures out how that could
+// work, we assume there is only one.
- // Skip the first section, which is always empty.
- p += This::shdr_size;
- for (unsigned int i = 1; i < shnum; ++i, p += This::shdr_size)
- {
- typename This::Shdr shdr(p);
- if (shdr.get_sh_type() == elfcpp::SHT_SYMTAB)
+template<int size, bool big_endian>
+void
+Sized_relobj<size, big_endian>::find_symtab(const unsigned char* pshdrs)
+{
+ const unsigned int shnum = this->shnum();
+ this->symtab_shndx_ = 0;
+ if (shnum > 0)
+ {
+ // Look through the sections in reverse order, since gas tends
+ // to put the symbol table at the end.
+ const unsigned char* p = pshdrs + shnum * This::shdr_size;
+ unsigned int i = shnum;
+ while (i > 0)
{
- this->symtab_shnum_ = i;
- break;
+ --i;
+ p -= This::shdr_size;
+ typename This::Shdr shdr(p);
+ if (shdr.get_sh_type() == elfcpp::SHT_SYMTAB)
+ {
+ this->symtab_shndx_ = i;
+ break;
+ }
}
}
}
void
Sized_relobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
{
- // Transfer our view of the section headers to SD.
- sd->section_headers = this->section_headers_;
- this->section_headers_ = NULL;
+ this->read_section_data(&this->elf_file_, sd);
- // Read the section names.
- const unsigned char* pshdrs = sd->section_headers->data();
- const unsigned char* pshdrnames = pshdrs + this->shstrndx_ * This::shdr_size;
- typename This::Shdr shdrnames(pshdrnames);
- sd->section_names_size = shdrnames.get_sh_size();
- sd->section_names = this->get_lasting_view(shdrnames.get_sh_offset(),
- sd->section_names_size);
+ const unsigned char* const pshdrs = sd->section_headers->data();
+
+ this->find_symtab(pshdrs);
- if (this->symtab_shnum_ == 0)
+ if (this->symtab_shndx_ == 0)
{
// No symbol table. Weird but legal.
sd->symbols = NULL;
// Get the symbol table section header.
typename This::Shdr symtabshdr(pshdrs
- + this->symtab_shnum_ * This::shdr_size);
- assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
+ + this->symtab_shndx_ * This::shdr_size);
+ gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
// We only need the external symbols.
const int sym_size = This::sym_size;
File_view* fvsymtab = this->get_lasting_view(extoff, extsize);
// Read the section header for the symbol names.
- unsigned int shnum = this->shnum();
- unsigned int strtab_shnum = symtabshdr.get_sh_link();
- if (strtab_shnum == 0 || strtab_shnum >= shnum)
+ unsigned int strtab_shndx = symtabshdr.get_sh_link();
+ if (strtab_shndx >= this->shnum())
{
fprintf(stderr, _("%s: %s: invalid symbol table name index: %u\n"),
- program_name, this->name().c_str(), strtab_shnum);
+ program_name, this->name().c_str(), strtab_shndx);
gold_exit(false);
}
- typename This::Shdr strtabshdr(pshdrs + strtab_shnum * This::shdr_size);
+ typename This::Shdr strtabshdr(pshdrs + strtab_shndx * This::shdr_size);
if (strtabshdr.get_sh_type() != elfcpp::SHT_STRTAB)
{
fprintf(stderr,
// Get the appropriate symbol table header (this will normally be
// the single SHT_SYMTAB section, but in principle it need not be).
- if (shdr.get_sh_link() >= this->shnum())
- {
- fprintf(stderr, _("%s: %s: section group %u link %u out of range\n"),
- program_name, this->name().c_str(), index, shdr.get_sh_link());
- gold_exit(false);
- }
-
- typename This::Shdr symshdr(this->section_header(shdr.get_sh_link()));
+ const unsigned int link = shdr.get_sh_link();
+ typename This::Shdr symshdr(this, this->elf_file_.section_header(link));
// Read the symbol table entry.
if (shdr.get_sh_info() >= symshdr.get_sh_size() / This::sym_size)
const unsigned char* psym = this->get_view(symoff, This::sym_size);
elfcpp::Sym<size, big_endian> sym(psym);
- // Read the section header for the symbol table names.
- if (symshdr.get_sh_link() >= this->shnum())
- {
- fprintf(stderr, _("%s; %s: symtab section %u link %u out of range\n"),
- program_name, this->name().c_str(), shdr.get_sh_link(),
- symshdr.get_sh_link());
- gold_exit(false);
- }
-
- typename This::Shdr symnamehdr(this->section_header(symshdr.get_sh_link()));
-
// Read the symbol table names.
- const unsigned char *psymnamesu = this->get_view(symnamehdr.get_sh_offset(),
- symnamehdr.get_sh_size());
+ off_t symnamelen;
+ const unsigned char* psymnamesu;
+ psymnamesu = this->section_contents(symshdr.get_sh_link(), &symnamelen);
const char* psymnames = reinterpret_cast<const char*>(psymnamesu);
// Get the section group signature.
- if (sym.get_st_name() >= symnamehdr.get_sh_size())
+ if (sym.get_st_name() >= symnamelen)
{
fprintf(stderr, _("%s: %s: symbol %u name offset %u out of range\n"),
program_name, this->name().c_str(), shdr.get_sh_info(),
// associated with a section symbol, and then fail to give a name to
// the section symbol. In such a case, use the name of the section.
// FIXME.
- if (signature[0] == '\0'
- && sym.get_st_type() == elfcpp::STT_SECTION
- && sym.get_st_shndx() < this->shnum())
+ std::string secname;
+ if (signature[0] == '\0' && sym.get_st_type() == elfcpp::STT_SECTION)
{
- typename This::Shdr shdrnames(this->section_header(this->shstrndx_));
- const unsigned char* pnamesu = this->get_view(shdrnames.get_sh_offset(),
- shdrnames.get_sh_size());
- const char* pnames = reinterpret_cast<const char*>(pnamesu);
-
- typename This::Shdr sechdr(this->section_header(sym.get_st_shndx()));
- if (sechdr.get_sh_name() >= shdrnames.get_sh_size())
- {
- fprintf(stderr,
- _("%s: %s: bad section name offset for section %u: %lu\n"),
- program_name, this->name().c_str(), sym.get_st_shndx(),
- static_cast<unsigned long>(sechdr.get_sh_name()));
- gold_exit(false);
- }
-
- signature = pnames + sechdr.get_sh_name();
+ secname = this->section_name(sym.get_st_shndx());
+ signature = secname.c_str();
}
// Record this section group, and see whether we've already seen one
Layout* layout,
Read_symbols_data* sd)
{
- unsigned int shnum = this->shnum();
+ const unsigned int shnum = this->shnum();
if (shnum == 0)
return;
// Keep track of which sections to omit.
std::vector<bool> omit(shnum, false);
- const char warn_prefix[] = ".gnu.warning.";
- const int warn_prefix_len = sizeof warn_prefix - 1;
-
// Skip the first, dummy, section.
pshdrs += This::shdr_size;
for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
const char* name = pnames + shdr.get_sh_name();
- if (strncmp(name, warn_prefix, warn_prefix_len) == 0)
+ if (this->handle_gnu_warning_section(name, i, symtab))
{
- symtab->add_warning(name + warn_prefix_len, this, i);
if (!options.is_relocatable())
omit[i] = true;
}
{
if (sd->symbols == NULL)
{
- assert(sd->symbol_names == NULL);
+ gold_assert(sd->symbol_names == NULL);
return;
}
const char* sym_names =
reinterpret_cast<const char*>(sd->symbol_names->data());
- symtab->add_from_object<size, big_endian>(this, sd->symbols->data(),
- symcount, sym_names,
- sd->symbol_names_size,
- this->symbols_);
+ symtab->add_from_relobj(this, sd->symbols->data(), symcount, sym_names,
+ sd->symbol_names_size, this->symbols_);
delete sd->symbols;
sd->symbols = NULL;
// Finalize the local symbols. Here we record the file offset at
// which they should be output, we add their names to *POOL, and we
-// add their values to THIS->VALUES_. Return the new file offset.
+// add their values to THIS->LOCAL_VALUES_. Return the symbol index.
// This function is always called from the main thread. The actual
// output of the local symbols will occur in a separate task.
template<int size, bool big_endian>
-off_t
-Sized_relobj<size, big_endian>::do_finalize_local_symbols(off_t off,
+unsigned int
+Sized_relobj<size, big_endian>::do_finalize_local_symbols(unsigned int index,
+ off_t off,
Stringpool* pool)
{
- if (this->symtab_shnum_ == 0)
+ gold_assert(this->symtab_shndx_ != -1U);
+ if (this->symtab_shndx_ == 0)
{
// This object has no symbols. Weird but legal.
- return off;
+ return index;
}
- off = align_address(off, size >> 3);
+ gold_assert(off == static_cast<off_t>(align_address(off, size >> 3)));
this->local_symbol_offset_ = off;
// Read the symbol table section header.
- typename This::Shdr symtabshdr(this->section_header(this->symtab_shnum_));
- assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
+ const unsigned int symtab_shndx = this->symtab_shndx_;
+ typename This::Shdr symtabshdr(this,
+ this->elf_file_.section_header(symtab_shndx));
+ gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
// Read the local symbols.
const int sym_size = This::sym_size;
const unsigned int loccount = this->local_symbol_count_;
- assert(loccount == symtabshdr.get_sh_info());
+ gold_assert(loccount == symtabshdr.get_sh_info());
off_t locsize = loccount * sym_size;
const unsigned char* psyms = this->get_view(symtabshdr.get_sh_offset(),
locsize);
- this->values_ = new typename elfcpp::Elf_types<size>::Elf_Addr[loccount];
-
- // Read the section header for the symbol names.
- typename This::Shdr strtabshdr(
- this->section_header(symtabshdr.get_sh_link()));
- assert(strtabshdr.get_sh_type() == elfcpp::SHT_STRTAB);
+ this->local_values_.resize(loccount);
// Read the symbol names.
- const unsigned char* pnamesu = this->get_view(strtabshdr.get_sh_offset(),
- strtabshdr.get_sh_size());
+ const unsigned int strtab_shndx = symtabshdr.get_sh_link();
+ off_t strtab_size;
+ const unsigned char* pnamesu = this->section_contents(strtab_shndx,
+ &strtab_size);
const char* pnames = reinterpret_cast<const char*>(pnamesu);
// Loop over the local symbols.
- std::vector<Map_to_output>& mo(this->map_to_output());
+ const std::vector<Map_to_output>& mo(this->map_to_output());
unsigned int shnum = this->shnum();
unsigned int count = 0;
// Skip the first, dummy, symbol.
{
elfcpp::Sym<size, big_endian> sym(psyms);
+ Symbol_value<size>& lv(this->local_values_[i]);
+
unsigned int shndx = sym.get_st_shndx();
+ lv.set_input_shndx(shndx);
if (shndx >= elfcpp::SHN_LORESERVE)
{
if (shndx == elfcpp::SHN_ABS)
- this->values_[i] = sym.get_st_value();
+ lv.set_output_value(sym.get_st_value());
else
{
// FIXME: Handle SHN_XINDEX.
gold_exit(false);
}
- if (mo[shndx].output_section == NULL)
+ Output_section* os = mo[shndx].output_section;
+
+ if (os == NULL)
{
- this->values_[i] = 0;
+ lv.set_output_value(0);
+ lv.set_no_output_symtab_entry();
continue;
}
- this->values_[i] = (mo[shndx].output_section->address()
- + mo[shndx].offset
- + sym.get_st_value());
+ if (mo[shndx].offset == -1)
+ lv.set_input_value(sym.get_st_value());
+ else
+ lv.set_output_value(mo[shndx].output_section->address()
+ + mo[shndx].offset
+ + sym.get_st_value());
}
- if (sym.get_st_type() != elfcpp::STT_SECTION)
+ // Decide whether this symbol should go into the output file.
+
+ if (sym.get_st_type() == elfcpp::STT_SECTION)
+ {
+ lv.set_no_output_symtab_entry();
+ continue;
+ }
+
+ if (sym.get_st_name() >= strtab_size)
{
- pool->add(pnames + sym.get_st_name());
- off += sym_size;
- ++count;
+ fprintf(stderr,
+ _("%s: %s: local symbol %u section name "
+ "out of range: %u >= %u\n"),
+ program_name, this->name().c_str(),
+ i, sym.get_st_name(),
+ static_cast<unsigned int>(strtab_size));
+ gold_exit(false);
}
+
+ const char* name = pnames + sym.get_st_name();
+ pool->add(name, NULL);
+ lv.set_output_symtab_index(index);
+ ++index;
+ ++count;
}
this->output_local_symbol_count_ = count;
- return off;
+ return index;
+}
+
+// Return the value of a local symbol defined in input section SHNDX,
+// with value VALUE, adding addend ADDEND. This handles SHF_MERGE
+// sections.
+template<int size, bool big_endian>
+typename elfcpp::Elf_types<size>::Elf_Addr
+Sized_relobj<size, big_endian>::local_value(unsigned int shndx,
+ Address value,
+ Address addend) const
+{
+ const std::vector<Map_to_output>& mo(this->map_to_output());
+ Output_section* os = mo[shndx].output_section;
+ if (os == NULL)
+ return addend;
+ gold_assert(mo[shndx].offset == -1);
+ return os->output_address(this, shndx, value + addend);
}
// Write out the local symbols.
Sized_relobj<size, big_endian>::write_local_symbols(Output_file* of,
const Stringpool* sympool)
{
- if (this->symtab_shnum_ == 0)
+ gold_assert(this->symtab_shndx_ != -1U);
+ if (this->symtab_shndx_ == 0)
{
// This object has no symbols. Weird but legal.
return;
}
// Read the symbol table section header.
- typename This::Shdr symtabshdr(this->section_header(this->symtab_shnum_));
- assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
+ const unsigned int symtab_shndx = this->symtab_shndx_;
+ typename This::Shdr symtabshdr(this,
+ this->elf_file_.section_header(symtab_shndx));
+ gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
const unsigned int loccount = this->local_symbol_count_;
- assert(loccount == symtabshdr.get_sh_info());
+ gold_assert(loccount == symtabshdr.get_sh_info());
// Read the local symbols.
const int sym_size = This::sym_size;
const unsigned char* psyms = this->get_view(symtabshdr.get_sh_offset(),
locsize);
- // Read the section header for the symbol names.
- typename This::Shdr strtabshdr(
- this->section_header(symtabshdr.get_sh_link()));
- assert(strtabshdr.get_sh_type() == elfcpp::SHT_STRTAB);
-
// Read the symbol names.
- const unsigned char* pnamesu = this->get_view(strtabshdr.get_sh_offset(),
- strtabshdr.get_sh_size());
+ const unsigned int strtab_shndx = symtabshdr.get_sh_link();
+ off_t strtab_size;
+ const unsigned char* pnamesu = this->section_contents(strtab_shndx,
+ &strtab_size);
const char* pnames = reinterpret_cast<const char*>(pnamesu);
// Get a view into the output file.
unsigned char* oview = of->get_output_view(this->local_symbol_offset_,
output_size);
- std::vector<Map_to_output>& mo(this->map_to_output());
+ const std::vector<Map_to_output>& mo(this->map_to_output());
+
+ gold_assert(this->local_values_.size() == loccount);
- psyms += sym_size;
unsigned char* ov = oview;
+ psyms += sym_size;
for (unsigned int i = 1; i < loccount; ++i, psyms += sym_size)
{
elfcpp::Sym<size, big_endian> isym(psyms);
- if (isym.get_st_type() == elfcpp::STT_SECTION)
+ if (!this->local_values_[i].needs_output_symtab_entry())
continue;
unsigned int st_shndx = isym.get_st_shndx();
if (st_shndx < elfcpp::SHN_LORESERVE)
{
- assert(st_shndx < mo.size());
+ gold_assert(st_shndx < mo.size());
if (mo[st_shndx].output_section == NULL)
continue;
st_shndx = mo[st_shndx].output_section->out_shndx();
elfcpp::Sym_write<size, big_endian> osym(ov);
- osym.put_st_name(sympool->get_offset(pnames + isym.get_st_name()));
- osym.put_st_value(this->values_[i]);
+ gold_assert(isym.get_st_name() < strtab_size);
+ const char* name = pnames + isym.get_st_name();
+ osym.put_st_name(sympool->get_offset(name));
+ osym.put_st_value(this->local_values_[i].value(this, 0));
osym.put_st_size(isym.get_st_size());
osym.put_st_info(isym.get_st_info());
osym.put_st_other(isym.get_st_other());
ov += sym_size;
}
- assert(ov - oview == output_size);
+ gold_assert(ov - oview == output_size);
of->write_output_view(this->local_symbol_offset_, output_size, oview);
}
// Input_objects methods.
-// Add a regular relocatable object to the list.
+// Add a regular relocatable object to the list. Return false if this
+// object should be ignored.
-void
+bool
Input_objects::add_object(Object* obj)
{
- if (obj->is_dynamic())
- this->dynobj_list_.push_back(static_cast<Dynobj*>(obj));
- else
+ if (!obj->is_dynamic())
this->relobj_list_.push_back(static_cast<Relobj*>(obj));
+ else
+ {
+ // See if this is a duplicate SONAME.
+ Dynobj* dynobj = static_cast<Dynobj*>(obj);
+
+ std::pair<Unordered_set<std::string>::iterator, bool> ins =
+ this->sonames_.insert(dynobj->soname());
+ if (!ins.second)
+ {
+ // We have already seen a dynamic object with this soname.
+ return false;
+ }
+
+ this->dynobj_list_.push_back(dynobj);
+ }
Target* target = obj->target();
if (this->target_ == NULL)
program_name, obj->name().c_str());
gold_exit(false);
}
+
+ return true;
}
// Relocate_info methods.
off_t offset, const elfcpp::Ehdr<size, big_endian>& ehdr)
{
int et = ehdr.get_e_type();
- if (et != elfcpp::ET_REL && et != elfcpp::ET_DYN)
- {
- fprintf(stderr, "%s: %s: unsupported ELF type %d\n",
- program_name, name.c_str(), static_cast<int>(et));
- gold_exit(false);
- }
-
if (et == elfcpp::ET_REL)
{
Sized_relobj<size, big_endian>* obj =
obj->setup(ehdr);
return obj;
}
+ else if (et == elfcpp::ET_DYN)
+ {
+ Sized_dynobj<size, big_endian>* obj =
+ new Sized_dynobj<size, big_endian>(name, input_file, offset, ehdr);
+ obj->setup(ehdr);
+ return obj;
+ }
else
{
- // elfcpp::ET_DYN
- fprintf(stderr, _("%s: %s: dynamic objects are not yet supported\n"),
- program_name, name.c_str());
+ fprintf(stderr, _("%s: %s: unsupported ELF file type %d\n"),
+ program_name, name.c_str(), et);
gold_exit(false);
-// Sized_dynobj<size, big_endian>* obj =
-// new Sized_dynobj<size, big_endian>(this->input_.name(), input_file,
-// offset, ehdr);
-// obj->setup(ehdr);
-// return obj;
}
}
}
if (big_endian)
{
+#ifdef HAVE_TARGET_32_BIG
elfcpp::Ehdr<32, true> ehdr(p);
return make_elf_sized_object<32, true>(name, input_file,
offset, ehdr);
+#else
+ fprintf(stderr,
+ _("%s: %s: not configured to support 32-bit big-endian object\n"),
+ program_name, name.c_str());
+ gold_exit(false);
+#endif
}
else
{
+#ifdef HAVE_TARGET_32_LITTLE
elfcpp::Ehdr<32, false> ehdr(p);
return make_elf_sized_object<32, false>(name, input_file,
offset, ehdr);
+#else
+ fprintf(stderr,
+ _("%s: %s: not configured to support 32-bit little-endian object\n"),
+ program_name, name.c_str());
+ gold_exit(false);
+#endif
}
}
else
}
if (big_endian)
{
+#ifdef HAVE_TARGET_64_BIG
elfcpp::Ehdr<64, true> ehdr(p);
return make_elf_sized_object<64, true>(name, input_file,
offset, ehdr);
+#else
+ fprintf(stderr,
+ _("%s: %s: not configured to support 64-bit big-endian object\n"),
+ program_name, name.c_str());
+ gold_exit(false);
+#endif
}
else
{
+#ifdef HAVE_TARGET_64_LITTLE
elfcpp::Ehdr<64, false> ehdr(p);
return make_elf_sized_object<64, false>(name, input_file,
offset, ehdr);
+#else
+ fprintf(stderr,
+ _("%s: %s: not configured to support 64-bit little-endian object\n"),
+ program_name, name.c_str());
+ gold_exit(false);
+#endif
}
}
}
// Instantiate the templates we need. We could use the configure
// script to restrict this to only the ones for implemented targets.
+#ifdef HAVE_TARGET_32_LITTLE
template
class Sized_relobj<32, false>;
+#endif
+#ifdef HAVE_TARGET_32_BIG
template
class Sized_relobj<32, true>;
+#endif
+#ifdef HAVE_TARGET_64_LITTLE
template
class Sized_relobj<64, false>;
+#endif
+#ifdef HAVE_TARGET_64_BIG
template
class Sized_relobj<64, true>;
+#endif
+#ifdef HAVE_TARGET_32_LITTLE
template
struct Relocate_info<32, false>;
+#endif
+#ifdef HAVE_TARGET_32_BIG
template
struct Relocate_info<32, true>;
+#endif
+#ifdef HAVE_TARGET_64_LITTLE
template
struct Relocate_info<64, false>;
+#endif
+#ifdef HAVE_TARGET_64_BIG
template
struct Relocate_info<64, true>;
+#endif
} // End namespace gold.
projects / deliverable / binutils-gdb.git / blobdiff