// 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),
+ output_local_dynsym_count_(0),
symbols_(),
local_symbol_offset_(0),
+ local_dynsym_offset_(0),
local_values_(),
local_got_offsets_(),
has_eh_frame_(false)
template<int size, bool big_endian>
bool
-Sized_relobj<size, big_endian>::find_eh_frame(const unsigned char* pshdrs,
- const char* names,
- off_t names_size) const
+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;
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;
+ this->local_values_.resize(loccount);
+ section_offset_type locsize = loccount * sym_size;
off_t dataoff = symtabshdr.get_sh_offset();
- off_t datasize = symtabshdr.get_sh_size();
+ section_size_type datasize =
+ convert_to_section_size_type(symtabshdr.get_sh_size());
off_t extoff = dataoff + locsize;
- off_t extsize = datasize - locsize;
+ section_size_type extsize = datasize - locsize;
off_t readoff = this->has_eh_frame_ ? dataoff : extoff;
- off_t readsize = this->has_eh_frame_ ? datasize : extsize;
+ section_size_type readsize = this->has_eh_frame_ ? datasize : extsize;
File_view* fvsymtab = this->get_lasting_view(readoff, readsize, false);
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
Sized_relobj<size, big_endian>::symbol_section_and_value(unsigned int sym,
Address* value)
{
- off_t symbols_size;
+ section_size_type symbols_size;
const unsigned char* symbols = this->section_contents(this->symtab_shndx_,
&symbols_size,
false);
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);
const int sym_size = This::sym_size;
size_t symcount = ((sd->symbols_size - sd->external_symbols_offset)
/ sym_size);
- if (static_cast<off_t>(symcount * sym_size)
- != sd->symbols_size - sd->external_symbols_offset)
+ if (symcount * sym_size != sd->symbols_size - sd->external_symbols_offset)
{
this->error(_("size of symbols is not multiple of symbol size"));
return;
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();
+ continue;
+ }
+
+ 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;
+ }
+
+ // 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());
+ 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 (lv.needs_output_symtab_entry())
+ {
+ lv.set_output_symtab_index(index);
+ ++index;
+ }
+ }
+ return index;
+}
- 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;
- }
+// Set the output dynamic symbol table indexes for the local variables.
- const char* name = pnames + sym.get_st_name();
- pool->add(name, true, NULL);
- lv.set_output_symtab_index(index);
- ++index;
- ++count;
+template<int size, bool big_endian>
+unsigned int
+Sized_relobj<size, big_endian>::do_set_local_dynsym_indexes(unsigned int index)
+{
+ 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;
+}
- this->output_local_symbol_count_ = count;
+// 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.
- return index;
+template<int size, bool big_endian>
+unsigned int
+Sized_relobj<size, big_endian>::do_set_local_dynsym_offset(off_t off)
+{
+ gold_assert(off == static_cast<off_t>(align_address(off, size >> 3)));
+ this->local_dynsym_offset_ = off;
+ return this->output_local_dynsym_count_;
}
// Return the value of the local symbol symndx.
return lv.value(this, 0);
}
-// 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.
-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
-{
- 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);
-}
-
// 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->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->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);
}
}
- set_parameters_size_and_endianness(target->get_size(),
- target->is_big_endian());
+ set_parameters_target(target);
return true;
}
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