// object.cc -- support for an object file for linking in gold
-// 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.
#include <cerrno>
#include <cstring>
#include <cstdarg>
+#include "demangle.h"
+#include "libiberty.h"
#include "target-select.h"
#include "dwarf_reader.h"
#include "layout.h"
#include "output.h"
#include "symtab.h"
+#include "reloc.h"
#include "object.h"
#include "dynobj.h"
// Return a view of the contents of a section.
const unsigned char*
-Object::section_contents(unsigned int shndx, off_t* plen, bool cache)
+Object::section_contents(unsigned int shndx, section_size_type* plen,
+ bool cache)
{
Location loc(this->do_section_contents(shndx));
- *plen = loc.data_size;
- return this->get_view(loc.file_offset, loc.data_size, cache);
+ *plen = convert_to_section_size_type(loc.data_size);
+ return this->get_view(loc.file_offset, *plen, cache);
}
// Read the section data into SD. This is code common to Sized_relobj
this->error(_("section name section has wrong type: %u"),
static_cast<unsigned int>(shdrnames.get_sh_type()));
- sd->section_names_size = shdrnames.get_sh_size();
+ sd->section_names_size =
+ convert_to_section_size_type(shdrnames.get_sh_size());
sd->section_names = this->get_lasting_view(shdrnames.get_sh_offset(),
sd->section_names_size, false);
}
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);
+ // Read the section contents to get the warning text. It would
+ // be nicer if we only did this if we have to actually issue a
+ // warning. Unfortunately, warnings are issued as we relocate
+ // sections. That means that we can not lock the object then,
+ // as we might try to issue the same warning multiple times
+ // simultaneously.
+ section_size_type len;
+ const unsigned char* contents = this->section_contents(shndx, &len,
+ false);
+ std::string warning(reinterpret_cast<const char*>(contents), len);
+ symtab->add_warning(name + warn_prefix_len, this, warning);
return true;
}
return false;
symtab_shndx_(-1U),
local_symbol_count_(0),
output_local_symbol_count_(0),
- symbols_(NULL),
+ output_local_dynsym_count_(0),
+ symbols_(),
local_symbol_offset_(0),
+ local_dynsym_offset_(0),
local_values_(),
- local_got_offsets_()
+ local_got_offsets_(),
+ has_eh_frame_(false)
{
}
}
}
+// Return whether SHDR has the right type and flags to be a GNU
+// .eh_frame section.
+
+template<int size, bool big_endian>
+bool
+Sized_relobj<size, big_endian>::check_eh_frame_flags(
+ const elfcpp::Shdr<size, big_endian>* shdr) const
+{
+ return (shdr->get_sh_size() > 0
+ && shdr->get_sh_type() == elfcpp::SHT_PROGBITS
+ && (shdr->get_sh_flags() & elfcpp::SHF_ALLOC) != 0);
+}
+
+// Return whether there is a GNU .eh_frame section, given the section
+// headers and the section names.
+
+template<int size, bool big_endian>
+bool
+Sized_relobj<size, big_endian>::find_eh_frame(
+ const unsigned char* pshdrs,
+ const char* names,
+ section_size_type names_size) const
+{
+ const unsigned int shnum = this->shnum();
+ const unsigned char* p = pshdrs + This::shdr_size;
+ for (unsigned int i = 1; i < shnum; ++i, p += This::shdr_size)
+ {
+ typename This::Shdr shdr(p);
+ if (this->check_eh_frame_flags(&shdr))
+ {
+ if (shdr.get_sh_name() >= names_size)
+ {
+ this->error(_("bad section name offset for section %u: %lu"),
+ i, static_cast<unsigned long>(shdr.get_sh_name()));
+ continue;
+ }
+
+ const char* name = names + shdr.get_sh_name();
+ if (strcmp(name, ".eh_frame") == 0)
+ return true;
+ }
+ }
+ return false;
+}
+
// Read the sections and symbols from an object file.
template<int size, bool big_endian>
this->find_symtab(pshdrs);
+ const unsigned char* namesu = sd->section_names->data();
+ const char* names = reinterpret_cast<const char*>(namesu);
+ if (memmem(names, sd->section_names_size, ".eh_frame", 10) != NULL)
+ {
+ if (this->find_eh_frame(pshdrs, names, sd->section_names_size))
+ this->has_eh_frame_ = true;
+ }
+
sd->symbols = NULL;
sd->symbols_size = 0;
+ sd->external_symbols_offset = 0;
sd->symbol_names = NULL;
sd->symbol_names_size = 0;
+ this->symtab_shndx_ * This::shdr_size);
gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
- // We only need the external symbols.
+ // If this object has a .eh_frame section, we need all the symbols.
+ // Otherwise we only need the external symbols. While it would be
+ // simpler to just always read all the symbols, I've seen object
+ // files with well over 2000 local symbols, which for a 64-bit
+ // object file format is over 5 pages that we don't need to read
+ // now.
+
const int sym_size = This::sym_size;
const unsigned int loccount = symtabshdr.get_sh_info();
this->local_symbol_count_ = loccount;
- off_t locsize = loccount * sym_size;
- off_t extoff = symtabshdr.get_sh_offset() + locsize;
- off_t extsize = symtabshdr.get_sh_size() - locsize;
+ this->local_values_.resize(loccount);
+ section_offset_type locsize = loccount * sym_size;
+ off_t dataoff = symtabshdr.get_sh_offset();
+ section_size_type datasize =
+ convert_to_section_size_type(symtabshdr.get_sh_size());
+ off_t extoff = dataoff + locsize;
+ section_size_type extsize = datasize - locsize;
- // Read the symbol table.
- File_view* fvsymtab = this->get_lasting_view(extoff, extsize, false);
+ off_t readoff = this->has_eh_frame_ ? dataoff : extoff;
+ section_size_type readsize = this->has_eh_frame_ ? datasize : extsize;
+
+ File_view* fvsymtab = this->get_lasting_view(readoff, readsize, false);
// Read the section header for the symbol names.
unsigned int strtab_shndx = symtabshdr.get_sh_link();
strtabshdr.get_sh_size(), true);
sd->symbols = fvsymtab;
- sd->symbols_size = extsize;
+ sd->symbols_size = readsize;
+ sd->external_symbols_offset = this->has_eh_frame_ ? locsize : 0;
sd->symbol_names = fvstrtab;
- sd->symbol_names_size = strtabshdr.get_sh_size();
+ sd->symbol_names_size =
+ convert_to_section_size_type(strtabshdr.get_sh_size());
+}
+
+// Return the section index of symbol SYM. Set *VALUE to its value in
+// the object file. Note that for a symbol which is not defined in
+// this object file, this will set *VALUE to 0 and return SHN_UNDEF;
+// it will not return the final value of the symbol in the link.
+
+template<int size, bool big_endian>
+unsigned int
+Sized_relobj<size, big_endian>::symbol_section_and_value(unsigned int sym,
+ Address* value)
+{
+ section_size_type symbols_size;
+ const unsigned char* symbols = this->section_contents(this->symtab_shndx_,
+ &symbols_size,
+ false);
+
+ const size_t count = symbols_size / This::sym_size;
+ gold_assert(sym < count);
+
+ elfcpp::Sym<size, big_endian> elfsym(symbols + sym * This::sym_size);
+ *value = elfsym.get_st_value();
+ // FIXME: Handle SHN_XINDEX.
+ return elfsym.get_st_shndx();
}
// Return whether to include a section group in the link. LAYOUT is
template<int size, bool big_endian>
bool
Sized_relobj<size, big_endian>::include_section_group(
+ Symbol_table* symtab,
Layout* layout,
unsigned int index,
+ const char* name,
const elfcpp::Shdr<size, big_endian>& shdr,
std::vector<bool>* omit)
{
// groups. Other section groups are always included in the link
// just like ordinary sections.
elfcpp::Elf_Word flags = elfcpp::Swap<32, big_endian>::readval(pword);
- if ((flags & elfcpp::GRP_COMDAT) == 0)
- return true;
// Look up the group signature, which is the name of a symbol. This
// is a lot of effort to go to to read a string. Why didn't they
- // just use the name of the SHT_GROUP section as the group
- // signature?
+ // just have the group signature point into the string table, rather
+ // than indirect through a symbol?
// Get the appropriate symbol table header (this will normally be
// the single SHT_SYMTAB section, but in principle it need not be).
return false;
}
off_t symoff = symshdr.get_sh_offset() + shdr.get_sh_info() * This::sym_size;
- const unsigned char* psym = this->get_view(symoff, This::sym_size, true);
+ const unsigned char* psym = this->get_view(symoff, This::sym_size, false);
elfcpp::Sym<size, big_endian> sym(psym);
// Read the symbol table names.
- off_t symnamelen;
+ section_size_type symnamelen;
const unsigned char* psymnamesu;
psymnamesu = this->section_contents(symshdr.get_sh_link(), &symnamelen,
true);
// Record this section group, and see whether we've already seen one
// with the same signature.
- if (layout->add_comdat(signature, true))
- return true;
+
+ if ((flags & elfcpp::GRP_COMDAT) == 0
+ || layout->add_comdat(signature, true))
+ {
+ if (parameters->options().relocatable())
+ layout->layout_group(symtab, this, index, name, signature, shdr,
+ pword);
+ return true;
+ }
// This is a duplicate. We want to discard the sections in this
// group.
const unsigned char* pnamesu = sd->section_names->data();
const char* pnames = reinterpret_cast<const char*>(pnamesu);
+ // For each section, record the index of the reloc section if any.
+ // Use 0 to mean that there is no reloc section, -1U to mean that
+ // there is more than one.
+ std::vector<unsigned int> reloc_shndx(shnum, 0);
+ std::vector<unsigned int> reloc_type(shnum, elfcpp::SHT_NULL);
+ // Skip the first, dummy, section.
+ pshdrs += This::shdr_size;
+ for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
+ {
+ typename This::Shdr shdr(pshdrs);
+
+ unsigned int sh_type = shdr.get_sh_type();
+ if (sh_type == elfcpp::SHT_REL || sh_type == elfcpp::SHT_RELA)
+ {
+ unsigned int target_shndx = shdr.get_sh_info();
+ if (target_shndx == 0 || target_shndx >= shnum)
+ {
+ this->error(_("relocation section %u has bad info %u"),
+ i, target_shndx);
+ continue;
+ }
+
+ if (reloc_shndx[target_shndx] != 0)
+ reloc_shndx[target_shndx] = -1U;
+ else
+ {
+ reloc_shndx[target_shndx] = i;
+ reloc_type[target_shndx] = sh_type;
+ }
+ }
+ }
+
std::vector<Map_to_output>& map_sections(this->map_to_output());
map_sections.resize(shnum);
+ // If we are only linking for symbols, then there is nothing else to
+ // do here.
+ if (this->input_file()->just_symbols())
+ {
+ delete sd->section_headers;
+ sd->section_headers = NULL;
+ delete sd->section_names;
+ sd->section_names = NULL;
+ return;
+ }
+
// Whether we've seen a .note.GNU-stack section.
bool seen_gnu_stack = false;
// The flags of a .note.GNU-stack section.
// Keep track of which sections to omit.
std::vector<bool> omit(shnum, false);
+ // Keep track of reloc sections when emitting relocations.
+ const bool relocatable = parameters->options().relocatable();
+ const bool emit_relocs = (relocatable
+ || parameters->options().emit_relocs());
+ std::vector<unsigned int> reloc_sections;
+
+ // Keep track of .eh_frame sections.
+ std::vector<unsigned int> eh_frame_sections;
+
// Skip the first, dummy, section.
- pshdrs += This::shdr_size;
+ pshdrs = sd->section_headers->data() + This::shdr_size;
for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
{
typename This::Shdr shdr(pshdrs);
if (this->handle_gnu_warning_section(name, i, symtab))
{
- if (!parameters->output_is_object())
+ if (!relocatable)
omit[i] = true;
}
{
if (shdr.get_sh_type() == elfcpp::SHT_GROUP)
{
- if (!this->include_section_group(layout, i, shdr, &omit))
+ if (!this->include_section_group(symtab, layout, i, name, shdr,
+ &omit))
discard = true;
}
else if ((shdr.get_sh_flags() & elfcpp::SHF_GROUP) == 0
continue;
}
+ // When doing a relocatable link we are going to copy input
+ // reloc sections into the output. We only want to copy the
+ // ones associated with sections which are not being discarded.
+ // However, we don't know that yet for all sections. So save
+ // reloc sections and process them later.
+ if (emit_relocs
+ && (shdr.get_sh_type() == elfcpp::SHT_REL
+ || shdr.get_sh_type() == elfcpp::SHT_RELA))
+ {
+ reloc_sections.push_back(i);
+ continue;
+ }
+
+ if (relocatable && shdr.get_sh_type() == elfcpp::SHT_GROUP)
+ continue;
+
+ // The .eh_frame section is special. It holds exception frame
+ // information that we need to read in order to generate the
+ // exception frame header. We process these after all the other
+ // sections so that the exception frame reader can reliably
+ // determine which sections are being discarded, and discard the
+ // corresponding information.
+ if (!relocatable
+ && strcmp(name, ".eh_frame") == 0
+ && this->check_eh_frame_flags(&shdr))
+ {
+ eh_frame_sections.push_back(i);
+ continue;
+ }
+
off_t offset;
- Output_section* os = layout->layout(this, i, name, shdr, &offset);
+ Output_section* os = layout->layout(this, i, name, shdr,
+ reloc_shndx[i], reloc_type[i],
+ &offset);
map_sections[i].output_section = os;
map_sections[i].offset = offset;
+
+ // If this section requires special handling, and if there are
+ // relocs that apply to it, then we must do the special handling
+ // before we apply the relocs.
+ if (offset == -1 && reloc_shndx[i] != 0)
+ this->set_relocs_must_follow_section_writes();
}
layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags);
+ // When doing a relocatable link handle the reloc sections at the
+ // end.
+ if (emit_relocs)
+ this->size_relocatable_relocs();
+ for (std::vector<unsigned int>::const_iterator p = reloc_sections.begin();
+ p != reloc_sections.end();
+ ++p)
+ {
+ unsigned int i = *p;
+ const unsigned char* pshdr;
+ pshdr = sd->section_headers->data() + i * This::shdr_size;
+ typename This::Shdr shdr(pshdr);
+
+ unsigned int data_shndx = shdr.get_sh_info();
+ if (data_shndx >= shnum)
+ {
+ // We already warned about this above.
+ continue;
+ }
+
+ Output_section* data_section = map_sections[data_shndx].output_section;
+ if (data_section == NULL)
+ {
+ map_sections[i].output_section = NULL;
+ continue;
+ }
+
+ Relocatable_relocs* rr = new Relocatable_relocs();
+ this->set_relocatable_relocs(i, rr);
+
+ Output_section* os = layout->layout_reloc(this, i, shdr, data_section,
+ rr);
+ map_sections[i].output_section = os;
+ map_sections[i].offset = -1;
+ }
+
+ // Handle the .eh_frame sections at the end.
+ for (std::vector<unsigned int>::const_iterator p = eh_frame_sections.begin();
+ p != eh_frame_sections.end();
+ ++p)
+ {
+ gold_assert(this->has_eh_frame_);
+ gold_assert(sd->external_symbols_offset != 0);
+
+ unsigned int i = *p;
+ const unsigned char *pshdr;
+ pshdr = sd->section_headers->data() + i * This::shdr_size;
+ typename This::Shdr shdr(pshdr);
+
+ off_t offset;
+ Output_section* os = layout->layout_eh_frame(this,
+ sd->symbols->data(),
+ sd->symbols_size,
+ sd->symbol_names->data(),
+ sd->symbol_names_size,
+ i, shdr,
+ reloc_shndx[i],
+ reloc_type[i],
+ &offset);
+ map_sections[i].output_section = os;
+ map_sections[i].offset = offset;
+
+ // If this section requires special handling, and if there are
+ // relocs that apply to it, then we must do the special handling
+ // before we apply the relocs.
+ if (offset == -1 && reloc_shndx[i] != 0)
+ this->set_relocs_must_follow_section_writes();
+ }
+
delete sd->section_headers;
sd->section_headers = NULL;
delete sd->section_names;
}
const int sym_size = This::sym_size;
- size_t symcount = sd->symbols_size / sym_size;
- if (static_cast<off_t>(symcount * sym_size) != sd->symbols_size)
+ size_t symcount = ((sd->symbols_size - sd->external_symbols_offset)
+ / sym_size);
+ if (symcount * sym_size != sd->symbols_size - sd->external_symbols_offset)
{
this->error(_("size of symbols is not multiple of symbol size"));
return;
}
- this->symbols_ = new Symbol*[symcount];
+ this->symbols_.resize(symcount);
const char* sym_names =
reinterpret_cast<const char*>(sd->symbol_names->data());
- symtab->add_from_relobj(this, sd->symbols->data(), symcount, sym_names,
- sd->symbol_names_size, this->symbols_);
+ symtab->add_from_relobj(this,
+ sd->symbols->data() + sd->external_symbols_offset,
+ symcount, sym_names, sd->symbol_names_size,
+ &this->symbols_);
delete sd->symbols;
sd->symbols = NULL;
sd->symbol_names = 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->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.
+// First pass over the local symbols. Here we add their names to
+// *POOL and *DYNPOOL, and we store the symbol value in
+// THIS->LOCAL_VALUES_. This function is always called from a
+// singleton thread. This is followed by a call to
+// finalize_local_symbols.
template<int size, bool big_endian>
-unsigned int
-Sized_relobj<size, big_endian>::do_finalize_local_symbols(unsigned int index,
- off_t off,
- Stringpool* pool)
+void
+Sized_relobj<size, big_endian>::do_count_local_symbols(Stringpool* pool,
+ Stringpool* dynpool)
{
gold_assert(this->symtab_shndx_ != -1U);
if (this->symtab_shndx_ == 0)
{
// This object has no symbols. Weird but legal.
- return index;
+ return;
}
- gold_assert(off == static_cast<off_t>(align_address(off, size >> 3)));
-
- this->local_symbol_offset_ = off;
-
// Read the symbol table section header.
const unsigned int symtab_shndx = this->symtab_shndx_;
typename This::Shdr symtabshdr(this,
const unsigned char* psyms = this->get_view(symtabshdr.get_sh_offset(),
locsize, true);
- this->local_values_.resize(loccount);
-
// Read the symbol names.
const unsigned int strtab_shndx = symtabshdr.get_sh_link();
- off_t strtab_size;
+ section_size_type strtab_size;
const unsigned char* pnamesu = this->section_contents(strtab_shndx,
&strtab_size,
true);
const std::vector<Map_to_output>& mo(this->map_to_output());
unsigned int shnum = this->shnum();
unsigned int count = 0;
+ unsigned int dyncount = 0;
// Skip the first, dummy, symbol.
psyms += sym_size;
for (unsigned int i = 1; i < loccount; ++i, psyms += sym_size)
if (sym.get_st_type() == elfcpp::STT_SECTION)
lv.set_is_section_symbol();
+ else if (sym.get_st_type() == elfcpp::STT_TLS)
+ lv.set_is_tls_symbol();
+
+ // Save the input symbol value for use in do_finalize_local_symbols().
+ lv.set_input_value(sym.get_st_value());
+
+ // Decide whether this symbol should go into the output file.
+
+ if (shndx < shnum && mo[shndx].output_section == NULL)
+ {
+ lv.set_no_output_symtab_entry();
+ gold_assert(!lv.needs_output_dynsym_entry());
+ continue;
+ }
+
+ if (sym.get_st_type() == elfcpp::STT_SECTION)
+ {
+ lv.set_no_output_symtab_entry();
+ gold_assert(!lv.needs_output_dynsym_entry());
+ continue;
+ }
+
+ if (sym.get_st_name() >= strtab_size)
+ {
+ this->error(_("local symbol %u section name out of range: %u >= %u"),
+ i, sym.get_st_name(),
+ static_cast<unsigned int>(strtab_size));
+ lv.set_no_output_symtab_entry();
+ continue;
+ }
+
+ // Add the symbol to the symbol table string pool.
+ const char* name = pnames + sym.get_st_name();
+ pool->add(name, true, NULL);
+ ++count;
+
+ // If needed, add the symbol to the dynamic symbol table string pool.
+ if (lv.needs_output_dynsym_entry())
+ {
+ dynpool->add(name, true, NULL);
+ ++dyncount;
+ }
+ }
+
+ this->output_local_symbol_count_ = count;
+ this->output_local_dynsym_count_ = dyncount;
+}
+
+// Finalize the local symbols. Here we set the final value in
+// THIS->LOCAL_VALUES_ and set their output symbol table indexes.
+// This function is always called from a singleton thread. The actual
+// output of the local symbols will occur in a separate task.
+
+template<int size, bool big_endian>
+unsigned int
+Sized_relobj<size, big_endian>::do_finalize_local_symbols(unsigned int index,
+ off_t off)
+{
+ gold_assert(off == static_cast<off_t>(align_address(off, size >> 3)));
+
+ const unsigned int loccount = this->local_symbol_count_;
+ this->local_symbol_offset_ = off;
+
+ const std::vector<Map_to_output>& mo(this->map_to_output());
+ unsigned int shnum = this->shnum();
+ for (unsigned int i = 1; i < loccount; ++i)
+ {
+ Symbol_value<size>& lv(this->local_values_[i]);
+
+ unsigned int shndx = lv.input_shndx();
+
+ // Set the output symbol value.
+
if (shndx >= elfcpp::SHN_LORESERVE)
{
- if (shndx == elfcpp::SHN_ABS)
- lv.set_output_value(sym.get_st_value());
+ if (shndx == elfcpp::SHN_ABS || shndx == elfcpp::SHN_COMMON)
+ lv.set_output_value(lv.input_value());
else
{
// FIXME: Handle SHN_XINDEX.
if (os == NULL)
{
lv.set_output_value(0);
- lv.set_no_output_symtab_entry();
continue;
}
-
- if (mo[shndx].offset == -1)
- lv.set_input_value(sym.get_st_value());
+ else if (mo[shndx].offset == -1)
+ {
+ // This is a SHF_MERGE section or one which otherwise
+ // requires special handling. We get the output address
+ // of the start of the merged section. If this is not a
+ // section symbol, we can then determine the final
+ // value. If it is a section symbol, we can not, as in
+ // that case we have to consider the addend to determine
+ // the value to use in a relocation.
+ if (!lv.is_section_symbol())
+ lv.set_output_value(os->output_address(this, shndx,
+ lv.input_value()));
+ else
+ {
+ section_offset_type start =
+ os->starting_output_address(this, shndx);
+ Merged_symbol_value<size>* msv =
+ new Merged_symbol_value<size>(lv.input_value(), start);
+ lv.set_merged_symbol_value(msv);
+ }
+ }
+ else if (lv.is_tls_symbol())
+ lv.set_output_value(os->tls_offset()
+ + mo[shndx].offset
+ + lv.input_value());
else
- lv.set_output_value(mo[shndx].output_section->address()
+ lv.set_output_value(os->address()
+ mo[shndx].offset
- + sym.get_st_value());
+ + lv.input_value());
}
- // 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)
- {
- this->error(_("local symbol %u section name out of range: %u >= %u"),
- i, sym.get_st_name(),
- static_cast<unsigned int>(strtab_size));
- lv.set_no_output_symtab_entry();
- continue;
- }
-
- const char* name = pnames + sym.get_st_name();
- pool->add(name, true, NULL);
- lv.set_output_symtab_index(index);
- ++index;
- ++count;
+ if (lv.needs_output_symtab_entry())
+ {
+ lv.set_output_symtab_index(index);
+ ++index;
+ }
}
-
- this->output_local_symbol_count_ = count;
-
return index;
}
-// Return the value of the local symbol symndx.
+// Set the output dynamic symbol table indexes for the local variables.
+
template<int size, bool big_endian>
-typename elfcpp::Elf_types<size>::Elf_Addr
-Sized_relobj<size, big_endian>::local_symbol_value(unsigned int symndx) const
+unsigned int
+Sized_relobj<size, big_endian>::do_set_local_dynsym_indexes(unsigned int index)
{
- gold_assert(symndx < this->local_symbol_count_);
- gold_assert(symndx < this->local_values_.size());
- const Symbol_value<size>& lv(this->local_values_[symndx]);
- return lv.value(this, 0);
+ const unsigned int loccount = this->local_symbol_count_;
+ for (unsigned int i = 1; i < loccount; ++i)
+ {
+ Symbol_value<size>& lv(this->local_values_[i]);
+ if (lv.needs_output_dynsym_entry())
+ {
+ lv.set_output_dynsym_index(index);
+ ++index;
+ }
+ }
+ return index;
}
-// Return the value of a local symbol defined in input section SHNDX,
-// with value VALUE, adding addend ADDEND. IS_SECTION_SYMBOL
-// indicates whether the symbol is a section symbol. This handles
-// SHF_MERGE sections.
+// Set the offset where local dynamic symbol information will be stored.
+// Returns the count of local symbols contributed to the symbol table by
+// this object.
+
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,
- bool is_section_symbol,
- Address addend) const
+unsigned int
+Sized_relobj<size, big_endian>::do_set_local_dynsym_offset(off_t off)
{
- 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);
-
- // Do the mapping required by the output section. If this is not a
- // section symbol, then we want to map the symbol value, and then
- // include the addend. If this is a section symbol, then we need to
- // include the addend to figure out where in the section we are,
- // before we do the mapping. This will do the right thing provided
- // the assembler is careful to only convert a relocation in a merged
- // section to a section symbol if there is a zero addend. If the
- // assembler does not do this, then in general we can't know what to
- // do, because we can't distinguish the addend for the instruction
- // format from the addend for the section offset.
-
- if (is_section_symbol)
- return os->output_address(this, shndx, value + addend);
- else
- return addend + os->output_address(this, shndx, value);
+ gold_assert(off == static_cast<off_t>(align_address(off, size >> 3)));
+ this->local_dynsym_offset_ = off;
+ return this->output_local_dynsym_count_;
}
// Write out the local symbols.
template<int size, bool big_endian>
void
-Sized_relobj<size, big_endian>::write_local_symbols(Output_file* of,
- const Stringpool* sympool)
+Sized_relobj<size, big_endian>::write_local_symbols(
+ Output_file* of,
+ const Stringpool* sympool,
+ const Stringpool* dynpool)
{
- if (parameters->strip_all())
+ if (parameters->options().strip_all()
+ && this->output_local_dynsym_count_ == 0)
return;
gold_assert(this->symtab_shndx_ != -1U);
// Read the symbol names.
const unsigned int strtab_shndx = symtabshdr.get_sh_link();
- off_t strtab_size;
+ section_size_type strtab_size;
const unsigned char* pnamesu = this->section_contents(strtab_shndx,
&strtab_size,
- true);
+ false);
const char* pnames = reinterpret_cast<const char*>(pnamesu);
- // Get a view into the output file.
+ // Get views into the output file for the portions of the symbol table
+ // and the dynamic symbol table that we will be writing.
off_t output_size = this->output_local_symbol_count_ * sym_size;
- unsigned char* oview = of->get_output_view(this->local_symbol_offset_,
- output_size);
+ unsigned char* oview = NULL;
+ if (output_size > 0)
+ oview = of->get_output_view(this->local_symbol_offset_, output_size);
+
+ off_t dyn_output_size = this->output_local_dynsym_count_ * sym_size;
+ unsigned char* dyn_oview = NULL;
+ if (dyn_output_size > 0)
+ dyn_oview = of->get_output_view(this->local_dynsym_offset_,
+ dyn_output_size);
const std::vector<Map_to_output>& mo(this->map_to_output());
gold_assert(this->local_values_.size() == loccount);
unsigned char* ov = oview;
+ unsigned char* dyn_ov = dyn_oview;
psyms += sym_size;
for (unsigned int i = 1; i < loccount; ++i, psyms += sym_size)
{
elfcpp::Sym<size, big_endian> isym(psyms);
- if (!this->local_values_[i].needs_output_symtab_entry())
- continue;
-
unsigned int st_shndx = isym.get_st_shndx();
if (st_shndx < elfcpp::SHN_LORESERVE)
{
st_shndx = mo[st_shndx].output_section->out_shndx();
}
- elfcpp::Sym_write<size, big_endian> osym(ov);
-
- 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());
- osym.put_st_shndx(st_shndx);
+ // Write the symbol to the output symbol table.
+ if (!parameters->options().strip_all()
+ && this->local_values_[i].needs_output_symtab_entry())
+ {
+ elfcpp::Sym_write<size, big_endian> osym(ov);
+
+ 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());
+ osym.put_st_shndx(st_shndx);
+
+ ov += sym_size;
+ }
- ov += sym_size;
+ // Write the symbol to the output dynamic symbol table.
+ if (this->local_values_[i].needs_output_dynsym_entry())
+ {
+ gold_assert(dyn_ov < dyn_oview + dyn_output_size);
+ elfcpp::Sym_write<size, big_endian> osym(dyn_ov);
+
+ gold_assert(isym.get_st_name() < strtab_size);
+ const char* name = pnames + isym.get_st_name();
+ osym.put_st_name(dynpool->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());
+ osym.put_st_shndx(st_shndx);
+
+ dyn_ov += sym_size;
+ }
}
- gold_assert(ov - oview == output_size);
- of->write_output_view(this->local_symbol_offset_, output_size, oview);
+ if (output_size > 0)
+ {
+ gold_assert(ov - oview == output_size);
+ of->write_output_view(this->local_symbol_offset_, output_size, oview);
+ }
+
+ if (dyn_output_size > 0)
+ {
+ gold_assert(dyn_ov - dyn_oview == dyn_output_size);
+ of->write_output_view(this->local_dynsym_offset_, dyn_output_size,
+ dyn_oview);
+ }
}
// Set *INFO to symbolic information about the offset OFFSET in the
if (this->symtab_shndx_ == 0)
return false;
- off_t symbols_size;
+ section_size_type symbols_size;
const unsigned char* symbols = this->section_contents(this->symtab_shndx_,
&symbols_size,
false);
unsigned int symbol_names_shndx = this->section_link(this->symtab_shndx_);
- off_t names_size;
+ section_size_type names_size;
const unsigned char* symbol_names_u =
this->section_contents(symbol_names_shndx, &names_size, false);
const char* symbol_names = reinterpret_cast<const char*>(symbol_names_u);
if (sym.get_st_name() > names_size)
info->enclosing_symbol_name = "(invalid)";
else
- info->enclosing_symbol_name = symbol_names + sym.get_st_name();
+ {
+ info->enclosing_symbol_name = symbol_names + sym.get_st_name();
+ if (parameters->options().demangle())
+ {
+ char* demangled_name = cplus_demangle(
+ info->enclosing_symbol_name.c_str(),
+ DMGL_ANSI | DMGL_PARAMS);
+ if (demangled_name != NULL)
+ {
+ info->enclosing_symbol_name.assign(demangled_name);
+ free(demangled_name);
+ }
+ }
+ }
return true;
}
}
bool
Input_objects::add_object(Object* obj)
{
+ // Set the global target from the first object file we recognize.
Target* target = obj->target();
- if (this->target_ == NULL)
- this->target_ = target;
- else if (this->target_ != target)
+ if (!parameters->target_valid())
+ set_parameters_target(target);
+ else if (target != ¶meters->target())
{
- gold_error(_("%s: incompatible target"), obj->name().c_str());
+ obj->error(_("incompatible target"));
return false;
}
{
// See if this is a duplicate SONAME.
Dynobj* dynobj = static_cast<Dynobj*>(obj);
+ const char* soname = dynobj->soname();
std::pair<Unordered_set<std::string>::iterator, bool> ins =
- this->sonames_.insert(dynobj->soname());
+ this->sonames_.insert(soname);
if (!ins.second)
{
// We have already seen a dynamic object with this soname.
}
this->dynobj_list_.push_back(dynobj);
- }
- set_parameters_size_and_endianness(target->get_size(),
- target->is_big_endian());
+ // If this is -lc, remember the directory in which we found it.
+ // We use this when issuing warnings about undefined symbols: as
+ // a heuristic, we don't warn about system libraries found in
+ // the same directory as -lc.
+ if (strncmp(soname, "libc.so", 7) == 0)
+ {
+ const char* object_name = dynobj->name().c_str();
+ const char* base = lbasename(object_name);
+ if (base != object_name)
+ this->system_library_directory_.assign(object_name,
+ base - 1 - object_name);
+ }
+ }
return true;
}
+// Return whether an object was found in the system library directory.
+
+bool
+Input_objects::found_in_system_library_directory(const Object* object) const
+{
+ return (!this->system_library_directory_.empty()
+ && object->name().compare(0,
+ this->system_library_directory_.size(),
+ this->system_library_directory_) == 0);
+}
+
+// For each dynamic object, record whether we've seen all of its
+// explicit dependencies.
+
+void
+Input_objects::check_dynamic_dependencies() const
+{
+ for (Dynobj_list::const_iterator p = this->dynobj_list_.begin();
+ p != this->dynobj_list_.end();
+ ++p)
+ {
+ const Dynobj::Needed& needed((*p)->needed());
+ bool found_all = true;
+ for (Dynobj::Needed::const_iterator pneeded = needed.begin();
+ pneeded != needed.end();
+ ++pneeded)
+ {
+ if (this->sonames_.find(*pneeded) == this->sonames_.end())
+ {
+ found_all = false;
+ break;
+ }
+ }
+ (*p)->set_has_unknown_needed_entries(!found_all);
+ }
+}
+
// Relocate_info methods.
// Return a string describing the location of a relocation. This is
// See if we can get line-number information from debugging sections.
std::string filename;
std::string file_and_lineno; // Better than filename-only, if available.
- for (unsigned int shndx = 0; shndx < this->object->shnum(); ++shndx)
- if (this->object->section_name(shndx) == ".debug_line")
- {
- off_t debuglines_size;
- const unsigned char* debuglines = this->object->section_contents(
- shndx, &debuglines_size, false);
- if (debuglines)
- {
- Dwarf_line_info line_info(debuglines, debuglines_size);
- line_info.read_line_mappings<size, big_endian>();
- file_and_lineno = line_info.addr2line(this->data_shndx, offset);
- }
- break;
- }
+
+ Sized_dwarf_line_info<size, big_endian> line_info(this->object);
+ // This will be "" if we failed to parse the debug info for any reason.
+ file_and_lineno = line_info.addr2line(this->data_shndx, offset);
std::string ret(this->object->name());
ret += ':';
if (this->object->get_symbol_location_info(this->data_shndx, offset, &info))
{
ret += " in function ";
- // We could demangle this name before printing, but we don't
- // bother because gcc runs linker output through a demangle
- // filter itself. The only advantage to demangling here is if
- // someone might call ld directly, rather than via gcc. If we
- // did want to demangle, cplus_demangle() is in libiberty.
ret += info.enclosing_symbol_name;
ret += ":";
filename = info.source_file;
Object*
make_elf_object(const std::string& name, Input_file* input_file, off_t offset,
- const unsigned char* p, off_t bytes)
+ const unsigned char* p, section_offset_type bytes)
{
if (bytes < elfcpp::EI_NIDENT)
{
projects / deliverable / binutils-gdb.git / blobdiff