forked from Imagelibrary/binutils-gdb
* object.cc (Xindex::initialize_symtab_xindex): New function.
(Xindex::read_symtab_xindex): New function. (Xindex::sym_xindex_to_shndx): New function. (Sized_relobj::find_symtab): Pick up SHT_SYMTAB_SHNDX section if available. (Sized_relobj::do_initialize_xindex): New function. (Sized_relobj::do_read_symbols): Adjust section links. (Sized_relobj::symbol_section_and_value): Add is_ordinary parameter. Change all callers. (Sized_relobj::include_section_group): Adjust section links and symbol section indexes. (Sized_relobj::do_layout): Adjust section links. (Sized_relobj::do_count_local_symbols): Adjust section links and symbol section indexes. (Sized_relobj::do_finalize_local_symbols): Distinguish between ordinary and special symbols. (Sized_relobj::write_local_symbols): Add symtab_xindex and dynsym_xindex parameters. Change all callers. Adjust section links. Use SHN_XINDEX when needed. (Sized_relobj::get_symbol_location_info): Adjust section links. Don't get fooled by special symbols. * object.h (class Xindex): Define. (class Object): Add xindex_ parameter. Declare virtual functoin do_initialize_xindex. (Object::adjust_sym_shndx): New function. (Object::set_xindex): New protected function. (class Symbol_value): Add is_ordinary_shndx_ field. (Symbol_value::Symbol_value): Initialize is_ordinary_shndx_. (Symbol_value::value): Assert ordinary section. (Symbol_value::initialize_input_to_output_map): Likewise. (Symbol_value::set_input_shndx): Add is_ordinary parameter. Change all callers. (Symbol_value::input_shndx): Add is_ordinary parameter. Change all callers. (class Sized_relobj): Update declarations. (Sized_relobj::local_symbol_input_shndx): Add is_ordinary parameter. Change all callers. (Sized_relobj::adjust_shndx): New function. * dynobj.cc (Sized_dynobj::Sized_dynobj): Initialize dynsym_shndx_ field. (Sized_dynobj::find_dynsym_sections): Remove pdynsym_shndx parameter. Change all callers. Pick up SHT_DYNSYM_SHNDX section for SHT_DYNSYM section if available. Set dynsym_shndx_ field. (Sized_dynobj::read_dynsym_section): Adjust section links. (Sized_dynobj::read_dynamic): Likewise. (Sized_dynobj::do_read_symbols): Use dynsym_shndx_ field. Adjust section links. (Sized_dynobj::do_initialize_xindex): New function. * dynobj.h (class Sized_dynobj): Add dynsym_shndx_ field. Declare do_initialize_xindex. (Sized_dynobj::adjust_shndx): New function. * layout.cc (Layout::Layout): Initialize symtab_xindex_ and dynsym_xindex_ fields. (Layout::finalize): Add a call to set_section_indexes before creating the symtab sections. (Layout::set_section_indexes): Don't do anything if the section already has a section index. (Layout::create_symtab_sections): Add shnum parameter. Change caller. Create .symtab_shndx section if needed. (Layout::create_shdrs): Add shstrtab_section parameter. Change caller. (Layout::allocated_output_section_count): New function. (Layout::create_dynamic_symtab): Create .dynsym_shndx section if needed. * layout.h (class Layout): Add symtab_xindex_ and dynsym_xindex_ fields. Update declarations. (Layout::symtab_xindex): New function. (Layout::dynsym_xindex): New function. (class Write_symbols_task): Add layout_ field. (Write_symbols_task::Write_symbols_task): Add layout parameter. Change caller. * output.cc (Output_section_headers::Output_section_headers): Add shstrtab_section parameter. Change all callers. (Output_section_headers::do_sized_write): Store overflow values for section count and section string table section index in section header zero. (Output_file_header::do_sized_write): Check for overflow of section count and section string table section index. (Output_symtab_xindex::do_write): New function. (Output_symtab_xindex::endian_do_write): New function. * output.h (class Output_section_headers): Add shstrtab_section_. Update declarations. (class Output_symtab_xindex): Define. (Output_section::has_out_shndx): New function. * symtab.cc (Symbol::init_fields): Initialize is_ordinary_shndx_ field. (Symbol::init_base): Add st_shndx and is_ordinary parameters. Change all callers. (Sized_symbol::init): Likewise. (Symbol::output_section): Check for ordinary symbol. (Symbol_table::add_from_object): Remove orig_sym parameter. Add st_shndx, is_ordinary, and orig_st_shndx parameters. Change all callers. (Symbol_table::add_from_relobj): Add symndx_offset parameter. Change all callers. Simplify handling of symbols from sections not included in the link. (Symbol_table::add_from_dynobj): Handle ordinary symbol distinction. (Weak_alias_sorter::operator()): Assert that symbols are ordinary. (Symbol_table::sized_finalize_symbol): Handle ordinary symbol distinction. (Symbol_table::write_globals): Add symtab_xindex and dynsym_xindex parameters. Change all callers. (Symbol_table::sized_write_globals): Likewise. Handle ordinary symbol distinction. Use SHN_XINDEX when needed. (Symbol_table::write_section_symbol): Add symtab_xindex parameter. Change all callers. (Symbol_table::sized_write_section_symbol): Likewise. Use SHN_XINDEX when needed. * symtab.h (class Symbol): Add is_ordinary_shndx_ field. Update declarations. (Symbol::shndx): Add is_ordinary parameter. Change all callers. (Symbol::is_defined): Check is_ordinary. (Symbol::is_undefined, Symbol::is_weak_undefined): Likewise. (Symbol::is_absolute, Symbol::is_common): Likewise. (class Sized_symbol): Update declarations. (class Symbol_table): Update declarations. * resolve.cc (Symbol::override_base): Add st_shndx and is_ordinary parameters. Change all callers. (Sized_symbol::override): Likewise. (Symbol_table::override): Likewise. (symbol_to_bits): Add is_ordinary parameter. Change all callers. (Symbol_table::resolve): Remove orig_sym parameter. Add st_shndx, is_ordinary, and orig_st_shndx parameters. Change all callers. * copy-relocs.cc (Copy_relocs::emit_copy_reloc): Require symbol to be in an ordinary section. * dwarf_reader.cc (Sized_dwarf_line_info::symbol_section): Add object and is_ordinary parameters. Change all callers. (Sized_dwarf_line_info::read_relocs): Add object parameter. Change all callers. Don't add undefined or non-ordinary symbols to reloc_map_. (Sized_dwarf_line_info::read_line_mappings): Add object parameter. Change all callers. * dwarf_reader.h (class Sized_dwarf_line_info): Update declarations. * ehframe.cc (Eh_frame::read_fde): Check for ordinary symbol. * reloc.cc (Sized_relobj::do_read_relocs): Adjust section links. (Sized_relobj::relocate_sections): Likewise. * target-reloc.h (scan_relocs): Adjust section symbol index. (scan_relocatable_relocs): Likewise. * i386.cc (Scan::local): Check for ordinary symbols. * sparc.cc (Scan::local): Likewise. * x86_64.cc (Scan::local): Likewise. * testsuite/binary_unittest.cc (Sized_binary_test): Update calls to symbol_section_and_value. * testsuite/many_sections_test.cc: New file. * testsuite/Makefile.am (BUILT_SOURCES): Define. (check_PROGRAMS): Add many_sections_test. (many_sections_test_SOURCES): Define. (many_sections_test_DEPENDENCIES): Define. (many_sections_test_LDFLAGS): Define. (BUILT_SOURCES): Add many_sections_define.h. (many_sections_define.h): New target. (BUILT_SOURCES): Add many_sections_check.h. (many_sections_check.h): New target. (check_PROGRAMS): Add many_sections_r_test. (many_sections_r_test_SOURCES): Define. (many_sections_r_test_DEPENDENCIES): Define. (many_sections_r_test_LDFLAGS): Define. (many_sections_r_test_LDADD): Define. (many_sections_r_test.o): New target. * testsuite/Makefile.in: Rebuild.
This commit is contained in:
Ian Lance Taylor
@@ -72,7 +72,8 @@ Sized_dynobj<size, big_endian>::Sized_dynobj(
|
||||
off_t offset,
|
||||
const elfcpp::Ehdr<size, big_endian>& ehdr)
|
||||
: Dynobj(name, input_file, offset),
|
||||
elf_file_(this, ehdr)
|
||||
elf_file_(this, ehdr),
|
||||
dynsym_shndx_(-1U)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -98,18 +99,18 @@ template<int size, bool big_endian>
|
||||
void
|
||||
Sized_dynobj<size, big_endian>::find_dynsym_sections(
|
||||
const unsigned char* pshdrs,
|
||||
unsigned int* pdynsym_shndx,
|
||||
unsigned int* pversym_shndx,
|
||||
unsigned int* pverdef_shndx,
|
||||
unsigned int* pverneed_shndx,
|
||||
unsigned int* pdynamic_shndx)
|
||||
{
|
||||
*pdynsym_shndx = -1U;
|
||||
*pversym_shndx = -1U;
|
||||
*pverdef_shndx = -1U;
|
||||
*pverneed_shndx = -1U;
|
||||
*pdynamic_shndx = -1U;
|
||||
|
||||
unsigned int xindex_shndx = 0;
|
||||
unsigned int xindex_link = 0;
|
||||
const unsigned int shnum = this->shnum();
|
||||
const unsigned char* p = pshdrs;
|
||||
for (unsigned int i = 0; i < shnum; ++i, p += This::shdr_size)
|
||||
@@ -120,7 +121,15 @@ Sized_dynobj<size, big_endian>::find_dynsym_sections(
|
||||
switch (shdr.get_sh_type())
|
||||
{
|
||||
case elfcpp::SHT_DYNSYM:
|
||||
pi = pdynsym_shndx;
|
||||
this->dynsym_shndx_ = i;
|
||||
if (xindex_shndx > 0 && xindex_link == i)
|
||||
{
|
||||
Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
|
||||
xindex->read_symtab_xindex<size, big_endian>(this, xindex_shndx,
|
||||
pshdrs);
|
||||
this->set_xindex(xindex);
|
||||
}
|
||||
pi = NULL;
|
||||
break;
|
||||
case elfcpp::SHT_GNU_versym:
|
||||
pi = pversym_shndx;
|
||||
@@ -134,6 +143,18 @@ Sized_dynobj<size, big_endian>::find_dynsym_sections(
|
||||
case elfcpp::SHT_DYNAMIC:
|
||||
pi = pdynamic_shndx;
|
||||
break;
|
||||
case elfcpp::SHT_SYMTAB_SHNDX:
|
||||
xindex_shndx = i;
|
||||
xindex_link = this->adjust_shndx(shdr.get_sh_link());
|
||||
if (xindex_link == this->dynsym_shndx_)
|
||||
{
|
||||
Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
|
||||
xindex->read_symtab_xindex<size, big_endian>(this, xindex_shndx,
|
||||
pshdrs);
|
||||
this->set_xindex(xindex);
|
||||
}
|
||||
pi = NULL;
|
||||
break;
|
||||
default:
|
||||
pi = NULL;
|
||||
break;
|
||||
@@ -178,9 +199,9 @@ Sized_dynobj<size, big_endian>::read_dynsym_section(
|
||||
|
||||
gold_assert(shdr.get_sh_type() == type);
|
||||
|
||||
if (shdr.get_sh_link() != link)
|
||||
if (this->adjust_shndx(shdr.get_sh_link()) != link)
|
||||
this->error(_("unexpected link in section %u header: %u != %u"),
|
||||
shndx, shdr.get_sh_link(), link);
|
||||
shndx, this->adjust_shndx(shdr.get_sh_link()), link);
|
||||
|
||||
*view = this->get_lasting_view(shdr.get_sh_offset(), shdr.get_sh_size(),
|
||||
true, false);
|
||||
@@ -210,7 +231,7 @@ Sized_dynobj<size, big_endian>::read_dynamic(const unsigned char* pshdrs,
|
||||
const unsigned char* pdynamic = this->get_view(dynamicshdr.get_sh_offset(),
|
||||
dynamic_size, true, false);
|
||||
|
||||
const unsigned int link = dynamicshdr.get_sh_link();
|
||||
const unsigned int link = this->adjust_shndx(dynamicshdr.get_sh_link());
|
||||
if (link != strtab_shndx)
|
||||
{
|
||||
if (link >= this->shnum())
|
||||
@@ -291,13 +312,12 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
|
||||
|
||||
const unsigned char* const pshdrs = sd->section_headers->data();
|
||||
|
||||
unsigned int dynsym_shndx;
|
||||
unsigned int versym_shndx;
|
||||
unsigned int verdef_shndx;
|
||||
unsigned int verneed_shndx;
|
||||
unsigned int dynamic_shndx;
|
||||
this->find_dynsym_sections(pshdrs, &dynsym_shndx, &versym_shndx,
|
||||
&verdef_shndx, &verneed_shndx, &dynamic_shndx);
|
||||
this->find_dynsym_sections(pshdrs, &versym_shndx, &verdef_shndx,
|
||||
&verneed_shndx, &dynamic_shndx);
|
||||
|
||||
unsigned int strtab_shndx = -1U;
|
||||
|
||||
@@ -307,10 +327,11 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
|
||||
sd->symbol_names = NULL;
|
||||
sd->symbol_names_size = 0;
|
||||
|
||||
if (dynsym_shndx != -1U)
|
||||
if (this->dynsym_shndx_ != -1U)
|
||||
{
|
||||
// Get the dynamic symbols.
|
||||
typename This::Shdr dynsymshdr(pshdrs + dynsym_shndx * This::shdr_size);
|
||||
typename This::Shdr dynsymshdr(pshdrs
|
||||
+ this->dynsym_shndx_ * This::shdr_size);
|
||||
gold_assert(dynsymshdr.get_sh_type() == elfcpp::SHT_DYNSYM);
|
||||
|
||||
sd->symbols = this->get_lasting_view(dynsymshdr.get_sh_offset(),
|
||||
@@ -320,7 +341,7 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
|
||||
convert_to_section_size_type(dynsymshdr.get_sh_size());
|
||||
|
||||
// Get the symbol names.
|
||||
strtab_shndx = dynsymshdr.get_sh_link();
|
||||
strtab_shndx = this->adjust_shndx(dynsymshdr.get_sh_link());
|
||||
if (strtab_shndx >= this->shnum())
|
||||
{
|
||||
this->error(_("invalid dynamic symbol table name index: %u"),
|
||||
@@ -346,8 +367,8 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
|
||||
|
||||
unsigned int dummy;
|
||||
this->read_dynsym_section(pshdrs, versym_shndx, elfcpp::SHT_GNU_versym,
|
||||
dynsym_shndx, &sd->versym, &sd->versym_size,
|
||||
&dummy);
|
||||
this->dynsym_shndx_,
|
||||
&sd->versym, &sd->versym_size, &dummy);
|
||||
|
||||
// We require that the version definition and need section link
|
||||
// to the same string table as the dynamic symbol table. This
|
||||
@@ -375,6 +396,19 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
|
||||
sd->symbol_names_size);
|
||||
}
|
||||
|
||||
// Return the Xindex structure to use for object with lots of
|
||||
// sections.
|
||||
|
||||
template<int size, bool big_endian>
|
||||
Xindex*
|
||||
Sized_dynobj<size, big_endian>::do_initialize_xindex()
|
||||
{
|
||||
gold_assert(this->dynsym_shndx_ != -1U);
|
||||
Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
|
||||
xindex->initialize_symtab_xindex<size, big_endian>(this, this->dynsym_shndx_);
|
||||
return xindex;
|
||||
}
|
||||
|
||||
// Lay out the input sections for a dynamic object. We don't want to
|
||||
// include sections from a dynamic object, so all that we actually do
|
||||
// here is check for .gnu.warning sections.
|
||||
|
||||
Reference in New Issue
Block a user