#include "layout.h"
#include "output.h"
#include "symtab.h"
+#include "cref.h"
#include "reloc.h"
#include "object.h"
#include "dynobj.h"
output_local_symbol_count_(0),
output_local_dynsym_count_(0),
symbols_(),
+ defined_count_(0),
local_symbol_offset_(0),
local_dynsym_offset_(0),
local_values_(),
local_got_offsets_(),
+ kept_comdat_sections_(),
+ comdat_groups_(),
has_eh_frame_(false)
{
}
off_t readoff = this->has_eh_frame_ ? dataoff : extoff;
section_size_type readsize = this->has_eh_frame_ ? datasize : extsize;
+ if (readsize == 0)
+ {
+ // No external symbols. Also weird but also legal.
+ return;
+ }
+
File_view* fvsymtab = this->get_lasting_view(readoff, readsize, true, false);
// Read the section header for the symbol names.
Layout* layout,
unsigned int index,
const char* name,
- const elfcpp::Shdr<size, big_endian>& shdr,
+ const unsigned char* shdrs,
+ const char* section_names,
+ section_size_type section_names_size,
std::vector<bool>* omit)
{
// Read the section contents.
+ typename This::Shdr shdr(shdrs + index * This::shdr_size);
const unsigned char* pcon = this->get_view(shdr.get_sh_offset(),
shdr.get_sh_size(), true, false);
const elfcpp::Elf_Word* pword =
return false;
}
- const char* signature = psymnames + sym.get_st_name();
+ std::string signature(psymnames + sym.get_st_name());
// It seems that some versions of gas will create a section group
// 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.
- std::string secname;
if (signature[0] == '\0' && sym.get_st_type() == elfcpp::STT_SECTION)
{
bool is_ordinary;
symndx, sym_shndx);
return false;
}
- secname = this->section_name(sym_shndx);
- signature = secname.c_str();
+ typename This::Shdr member_shdr(shdrs + sym_shndx * This::shdr_size);
+ if (member_shdr.get_sh_name() < section_names_size)
+ signature = section_names + member_shdr.get_sh_name();
}
- // Record this section group, and see whether we've already seen one
- // with the same signature.
+ // Record this section group in the layout, and see whether we've already
+ // seen one with the same signature.
+ bool include_group = ((flags & elfcpp::GRP_COMDAT) == 0
+ || layout->add_comdat(this, index, signature, true));
+
+ Sized_relobj<size, big_endian>* kept_object = NULL;
+ Comdat_group* kept_group = NULL;
- if ((flags & elfcpp::GRP_COMDAT) == 0
- || layout->add_comdat(signature, true))
+ if (!include_group)
{
- if (parameters->options().relocatable())
- layout->layout_group(symtab, this, index, name, signature, shdr,
- pword);
- return true;
+ // This group is being discarded. Find the object and group
+ // that was kept in its place.
+ unsigned int kept_group_index = 0;
+ Relobj* kept_relobj = layout->find_kept_object(signature,
+ &kept_group_index);
+ kept_object = static_cast<Sized_relobj<size, big_endian>*>(kept_relobj);
+ if (kept_object != NULL)
+ kept_group = kept_object->find_comdat_group(kept_group_index);
+ }
+ else if (flags & elfcpp::GRP_COMDAT)
+ {
+ // This group is being kept. Create the table to map section names
+ // to section indexes and add it to the table of groups.
+ kept_group = new Comdat_group();
+ this->add_comdat_group(index, kept_group);
}
- // This is a duplicate. We want to discard the sections in this
- // group.
size_t count = shdr.get_sh_size() / sizeof(elfcpp::Elf_Word);
+
+ std::vector<unsigned int> shndxes;
+ bool relocate_group = include_group && parameters->options().relocatable();
+ if (relocate_group)
+ shndxes.reserve(count - 1);
+
for (size_t i = 1; i < count; ++i)
{
elfcpp::Elf_Word secnum =
- elfcpp::Swap<32, big_endian>::readval(pword + i);
+ this->adjust_shndx(elfcpp::Swap<32, big_endian>::readval(pword + i));
+
+ if (relocate_group)
+ shndxes.push_back(secnum);
+
if (secnum >= this->shnum())
{
this->error(_("section %u in section group %u out of range"),
this->error(_("invalid section group %u refers to earlier section %u"),
index, secnum);
- (*omit)[secnum] = true;
+ // Get the name of the member section.
+ typename This::Shdr member_shdr(shdrs + secnum * This::shdr_size);
+ if (member_shdr.get_sh_name() >= section_names_size)
+ {
+ // This is an error, but it will be diagnosed eventually
+ // in do_layout, so we don't need to do anything here but
+ // ignore it.
+ continue;
+ }
+ std::string mname(section_names + member_shdr.get_sh_name());
+
+ if (!include_group)
+ {
+ (*omit)[secnum] = true;
+ if (kept_group != NULL)
+ {
+ // Find the corresponding kept section, and store that info
+ // in the discarded section table.
+ Comdat_group::const_iterator p = kept_group->find(mname);
+ if (p != kept_group->end())
+ {
+ Kept_comdat_section* kept =
+ new Kept_comdat_section(kept_object, p->second);
+ this->set_kept_comdat_section(secnum, kept);
+ }
+ }
+ }
+ else if (flags & elfcpp::GRP_COMDAT)
+ {
+ // Add the section to the kept group table.
+ gold_assert(kept_group != NULL);
+ kept_group->insert(std::make_pair(mname, secnum));
+ }
}
- return false;
+ if (relocate_group)
+ layout->layout_group(symtab, this, index, name, signature.c_str(),
+ shdr, flags, &shndxes);
+
+ return include_group;
}
// Whether to include a linkonce section in the link. NAME is the
bool
Sized_relobj<size, big_endian>::include_linkonce_section(
Layout* layout,
+ unsigned int index,
const char* name,
const elfcpp::Shdr<size, big_endian>&)
{
symname = name + strlen(linkonce_t);
else
symname = strrchr(name, '.') + 1;
- bool include1 = layout->add_comdat(symname, false);
- bool include2 = layout->add_comdat(name, true);
+ std::string sig1(symname);
+ std::string sig2(name);
+ bool include1 = layout->add_comdat(this, index, sig1, false);
+ bool include2 = layout->add_comdat(this, index, sig2, true);
+
+ if (!include2)
+ {
+ // The section is being discarded on the basis of its section
+ // name (i.e., the kept section was also a linkonce section).
+ // In this case, the section index stored with the layout object
+ // is the linkonce section that was kept.
+ unsigned int kept_group_index = 0;
+ Relobj* kept_relobj = layout->find_kept_object(sig2, &kept_group_index);
+ if (kept_relobj != NULL)
+ {
+ Sized_relobj<size, big_endian>* kept_object
+ = static_cast<Sized_relobj<size, big_endian>*>(kept_relobj);
+ Kept_comdat_section* kept =
+ new Kept_comdat_section(kept_object, kept_group_index);
+ this->set_kept_comdat_section(index, kept);
+ }
+ }
+ else if (!include1)
+ {
+ // The section is being discarded on the basis of its symbol
+ // name. This means that the corresponding kept section was
+ // part of a comdat group, and it will be difficult to identify
+ // the specific section within that group that corresponds to
+ // this linkonce section. We'll handle the simple case where
+ // the group has only one member section. Otherwise, it's not
+ // worth the effort.
+ unsigned int kept_group_index = 0;
+ Relobj* kept_relobj = layout->find_kept_object(sig1, &kept_group_index);
+ if (kept_relobj != NULL)
+ {
+ Sized_relobj<size, big_endian>* kept_object =
+ static_cast<Sized_relobj<size, big_endian>*>(kept_relobj);
+ Comdat_group* kept_group =
+ kept_object->find_comdat_group(kept_group_index);
+ if (kept_group != NULL && kept_group->size() == 1)
+ {
+ Comdat_group::const_iterator p = kept_group->begin();
+ gold_assert(p != kept_group->end());
+ Kept_comdat_section* kept =
+ new Kept_comdat_section(kept_object, p->second);
+ this->set_kept_comdat_section(index, kept);
+ }
+ }
+ }
+
return include1 && include2;
}
return;
// Get the section headers.
- const unsigned char* pshdrs = sd->section_headers->data();
+ const unsigned char* shdrs = sd->section_headers->data();
+ const unsigned char* pshdrs;
// Get the section names.
const unsigned char* pnamesu = sd->section_names->data();
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;
+ pshdrs = shdrs + This::shdr_size;
for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
{
typename This::Shdr shdr(pshdrs);
}
}
- std::vector<Map_to_output>& map_sections(this->map_to_output());
- map_sections.resize(shnum);
+ Output_sections& out_sections(this->output_sections());
+ std::vector<Address>& out_section_offsets(this->section_offsets_);
+
+ out_sections.resize(shnum);
+ out_section_offsets.resize(shnum);
// If we are only linking for symbols, then there is nothing else to
// do here.
std::vector<unsigned int> eh_frame_sections;
// Skip the first, dummy, section.
- pshdrs = sd->section_headers->data() + This::shdr_size;
+ pshdrs = shdrs + This::shdr_size;
for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
{
typename This::Shdr shdr(pshdrs);
{
if (shdr.get_sh_type() == elfcpp::SHT_GROUP)
{
- if (!this->include_section_group(symtab, layout, i, name, shdr,
+ if (!this->include_section_group(symtab, layout, i, name, shdrs,
+ pnames, sd->section_names_size,
&omit))
discard = true;
}
else if ((shdr.get_sh_flags() & elfcpp::SHF_GROUP) == 0
&& Layout::is_linkonce(name))
{
- if (!this->include_linkonce_section(layout, name, shdr))
+ if (!this->include_linkonce_section(layout, i, name, shdr))
discard = true;
}
}
if (discard)
{
// Do not include this section in the link.
- map_sections[i].output_section = NULL;
+ out_sections[i] = NULL;
+ out_section_offsets[i] = -1U;
continue;
}
reloc_shndx[i], reloc_type[i],
&offset);
- map_sections[i].output_section = os;
- map_sections[i].offset = offset;
+ out_sections[i] = os;
+ if (offset == -1)
+ out_section_offsets[i] = -1U;
+ else
+ out_section_offsets[i] = convert_types<Address, off_t>(offset);
// If this section requires special handling, and if there are
// relocs that apply to it, then we must do the special handling
continue;
}
- Output_section* data_section = map_sections[data_shndx].output_section;
+ Output_section* data_section = out_sections[data_shndx];
if (data_section == NULL)
{
- map_sections[i].output_section = NULL;
+ out_sections[i] = NULL;
+ out_section_offsets[i] = -1U;
continue;
}
Output_section* os = layout->layout_reloc(this, i, shdr, data_section,
rr);
- map_sections[i].output_section = os;
- map_sections[i].offset = -1;
+ out_sections[i] = os;
+ out_section_offsets[i] = -1U;
}
// Handle the .eh_frame sections at the end.
reloc_shndx[i],
reloc_type[i],
&offset);
- map_sections[i].output_section = os;
- map_sections[i].offset = offset;
+ out_sections[i] = os;
+ if (offset == -1)
+ out_section_offsets[i] = -1U;
+ else
+ out_section_offsets[i] = convert_types<Address, off_t>(offset);
// If this section requires special handling, and if there are
// relocs that apply to it, then we must do the special handling
sd->symbols->data() + sd->external_symbols_offset,
symcount, this->local_symbol_count_,
sym_names, sd->symbol_names_size,
- &this->symbols_);
+ &this->symbols_,
+ &this->defined_count_);
delete sd->symbols;
sd->symbols = NULL;
// Loop over the local symbols.
- const std::vector<Map_to_output>& mo(this->map_to_output());
+ const Output_sections& out_sections(this->output_sections());
unsigned int shnum = this->shnum();
unsigned int count = 0;
unsigned int dyncount = 0;
// Decide whether this symbol should go into the output file.
- if (shndx < shnum && mo[shndx].output_section == NULL)
+ if (shndx < shnum && out_sections[shndx] == NULL)
{
lv.set_no_output_symtab_entry();
gold_assert(!lv.needs_output_dynsym_entry());
const unsigned int loccount = this->local_symbol_count_;
this->local_symbol_offset_ = off;
- const std::vector<Map_to_output>& mo(this->map_to_output());
+ const Output_sections& out_sections(this->output_sections());
+ const std::vector<Address>& out_offsets(this->section_offsets_);
unsigned int shnum = this->shnum();
for (unsigned int i = 1; i < loccount; ++i)
unsigned int shndx = lv.input_shndx(&is_ordinary);
// Set the output symbol value.
-
+
if (!is_ordinary)
{
if (shndx == elfcpp::SHN_ABS || shndx == elfcpp::SHN_COMMON)
shndx = 0;
}
- Output_section* os = mo[shndx].output_section;
+ Output_section* os = out_sections[shndx];
if (os == NULL)
{
- lv.set_output_value(0);
+ // This local symbol belongs to a section we are discarding.
+ // In some cases when applying relocations later, we will
+ // attempt to match it to the corresponding kept section,
+ // so we leave the input value unchanged here.
continue;
}
- else if (mo[shndx].offset == -1)
+ else if (out_offsets[shndx] == -1U)
{
// This is a SHF_MERGE section or one which otherwise
// requires special handling. We get the output address
}
else if (lv.is_tls_symbol())
lv.set_output_value(os->tls_offset()
- + mo[shndx].offset
+ + out_offsets[shndx]
+ lv.input_value());
else
lv.set_output_value(os->address()
- + mo[shndx].offset
+ + out_offsets[shndx]
+ lv.input_value());
}
dyn_oview = of->get_output_view(this->local_dynsym_offset_,
dyn_output_size);
- const std::vector<Map_to_output>& mo(this->map_to_output());
+ const Output_sections out_sections(this->output_sections());
gold_assert(this->local_values_.size() == loccount);
&is_ordinary);
if (is_ordinary)
{
- gold_assert(st_shndx < mo.size());
- if (mo[st_shndx].output_section == NULL)
+ gold_assert(st_shndx < out_sections.size());
+ if (out_sections[st_shndx] == NULL)
continue;
- st_shndx = mo[st_shndx].output_section->out_shndx();
+ st_shndx = out_sections[st_shndx]->out_shndx();
if (st_shndx >= elfcpp::SHN_LORESERVE)
{
if (lv.needs_output_symtab_entry())
return false;
}
+// Look for a kept section corresponding to the given discarded section,
+// and return its output address. This is used only for relocations in
+// debugging sections. If we can't find the kept section, return 0.
+
+template<int size, bool big_endian>
+typename Sized_relobj<size, big_endian>::Address
+Sized_relobj<size, big_endian>::map_to_kept_section(
+ unsigned int shndx,
+ bool* found) const
+{
+ Kept_comdat_section *kept = this->get_kept_comdat_section(shndx);
+ if (kept != NULL)
+ {
+ gold_assert(kept->object_ != NULL);
+ *found = true;
+ Output_section* os = kept->object_->output_section(kept->shndx_);
+ Address offset = kept->object_->get_output_section_offset(kept->shndx_);
+ gold_assert(os != NULL && offset != -1U);
+ return os->address() + offset;
+ }
+ *found = false;
+ return 0;
+}
+
+// Get symbol counts.
+
+template<int size, bool big_endian>
+void
+Sized_relobj<size, big_endian>::do_get_global_symbol_counts(
+ const Symbol_table*,
+ size_t* defined,
+ size_t* used) const
+{
+ *defined = this->defined_count_;
+ size_t count = 0;
+ for (Symbols::const_iterator p = this->symbols_.begin();
+ p != this->symbols_.end();
+ ++p)
+ if (*p != NULL
+ && (*p)->source() == Symbol::FROM_OBJECT
+ && (*p)->object() == this
+ && (*p)->is_defined())
+ ++count;
+ *used = count;
+}
+
// Input_objects methods.
// Add a regular relocatable object to the list. Return false if this
}
}
+ // Add this object to the cross-referencer if requested.
+ if (parameters->options().user_set_print_symbol_counts())
+ {
+ if (this->cref_ == NULL)
+ this->cref_ = new Cref();
+ this->cref_->add_object(obj);
+ }
+
return true;
}
}
}
+// Start processing an archive.
+
+void
+Input_objects::archive_start(Archive* archive)
+{
+ if (parameters->options().user_set_print_symbol_counts())
+ {
+ if (this->cref_ == NULL)
+ this->cref_ = new Cref();
+ this->cref_->add_archive_start(archive);
+ }
+}
+
+// Stop processing an archive.
+
+void
+Input_objects::archive_stop(Archive* archive)
+{
+ if (parameters->options().user_set_print_symbol_counts())
+ this->cref_->add_archive_stop(archive);
+}
+
+// Print symbol counts
+
+void
+Input_objects::print_symbol_counts(const Symbol_table* symtab) const
+{
+ if (parameters->options().user_set_print_symbol_counts()
+ && this->cref_ != NULL)
+ this->cref_->print_symbol_counts(symtab);
+}
+
// Relocate_info methods.
// Return a string describing the location of a relocation. This is