mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 19:14:52 +08:00
d491d34e93
(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.
239 lines
7.0 KiB
C++
239 lines
7.0 KiB
C++
// copy-relocs.cc -- handle COPY relocations for gold.
|
|
|
|
// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
// This file is part of gold.
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
// MA 02110-1301, USA.
|
|
|
|
#include "gold.h"
|
|
|
|
#include "symtab.h"
|
|
#include "copy-relocs.h"
|
|
|
|
namespace gold
|
|
{
|
|
|
|
// Copy_relocs::Copy_reloc_entry methods.
|
|
|
|
// Emit the reloc if appropriate.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::Copy_reloc_entry::emit(
|
|
Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
|
|
{
|
|
// If the symbol is no longer defined in a dynamic object, then we
|
|
// emitted a COPY relocation, and we do not want to emit this
|
|
// dynamic relocation.
|
|
if (this->sym_->is_from_dynobj())
|
|
reloc_section->add_global(this->sym_, this->reloc_type_,
|
|
this->output_section_, this->relobj_,
|
|
this->shndx_, this->address_,
|
|
this->addend_);
|
|
}
|
|
|
|
// Copy_relocs methods.
|
|
|
|
// Handle a relocation against a symbol which may force us to generate
|
|
// a COPY reloc.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::copy_reloc(
|
|
Symbol_table* symtab,
|
|
Layout* layout,
|
|
Sized_symbol<size>* sym,
|
|
Relobj* object,
|
|
unsigned int shndx,
|
|
Output_section *output_section,
|
|
const Reloc& rel,
|
|
Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
|
|
{
|
|
if (this->need_copy_reloc(sym, object, shndx))
|
|
this->emit_copy_reloc(symtab, layout, sym, reloc_section);
|
|
else
|
|
{
|
|
// We may not need a COPY relocation. Save this relocation to
|
|
// possibly be emitted later.
|
|
this->save(sym, object, shndx, output_section, rel);
|
|
}
|
|
}
|
|
|
|
// Return whether we need a COPY reloc for a relocation against SYM.
|
|
// The relocation is begin applied to section SHNDX in OBJECT.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
bool
|
|
Copy_relocs<sh_type, size, big_endian>::need_copy_reloc(
|
|
Sized_symbol<size>* sym,
|
|
Relobj* object,
|
|
unsigned int shndx) const
|
|
{
|
|
// FIXME: Handle -z nocopyrelocs.
|
|
|
|
if (sym->symsize() == 0)
|
|
return false;
|
|
|
|
// If this is a readonly section, then we need a COPY reloc.
|
|
// Otherwise we can use a dynamic reloc. Note that calling
|
|
// section_flags here can be slow, as the information is not cached;
|
|
// fortunately we shouldn't see too many potential COPY relocs.
|
|
if ((object->section_flags(shndx) & elfcpp::SHF_WRITE) == 0)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
// Emit a COPY relocation for SYM.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::emit_copy_reloc(
|
|
Symbol_table* symtab,
|
|
Layout* layout,
|
|
Sized_symbol<size>* sym,
|
|
Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
|
|
{
|
|
typename elfcpp::Elf_types<size>::Elf_WXword symsize = sym->symsize();
|
|
|
|
// There is no defined way to determine the required alignment of
|
|
// the symbol. We know that the symbol is defined in a dynamic
|
|
// object. We start with the alignment of the section in which it
|
|
// is defined; presumably we do not require an alignment larger than
|
|
// that. Then we reduce that alignment if the symbol is not aligned
|
|
// within the section.
|
|
gold_assert(sym->is_from_dynobj());
|
|
bool is_ordinary;
|
|
unsigned int shndx = sym->shndx(&is_ordinary);
|
|
gold_assert(is_ordinary);
|
|
typename elfcpp::Elf_types<size>::Elf_WXword addralign =
|
|
sym->object()->section_addralign(shndx);
|
|
|
|
typename Sized_symbol<size>::Value_type value = sym->value();
|
|
while ((value & (addralign - 1)) != 0)
|
|
addralign >>= 1;
|
|
|
|
if (this->dynbss_ == NULL)
|
|
{
|
|
this->dynbss_ = new Output_data_space(addralign);
|
|
layout->add_output_section_data(".bss",
|
|
elfcpp::SHT_NOBITS,
|
|
elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
|
|
this->dynbss_);
|
|
}
|
|
|
|
Output_data_space* dynbss = this->dynbss_;
|
|
|
|
if (addralign > dynbss->addralign())
|
|
dynbss->set_space_alignment(addralign);
|
|
|
|
section_size_type dynbss_size =
|
|
convert_to_section_size_type(dynbss->current_data_size());
|
|
dynbss_size = align_address(dynbss_size, addralign);
|
|
section_size_type offset = dynbss_size;
|
|
dynbss->set_current_data_size(dynbss_size + symsize);
|
|
|
|
// Define the symbol as being copied.
|
|
symtab->define_with_copy_reloc(sym, dynbss, offset);
|
|
|
|
// Add the COPY relocation to the dynamic reloc section.
|
|
this->add_copy_reloc(sym, offset, reloc_section);
|
|
}
|
|
|
|
// Add a COPY relocation for SYM to RELOC_SECTION.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::add_copy_reloc(
|
|
Symbol* sym,
|
|
section_size_type offset,
|
|
Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
|
|
{
|
|
reloc_section->add_global(sym, this->copy_reloc_type_, this->dynbss_,
|
|
offset, 0);
|
|
}
|
|
|
|
// Save a relocation to possibly be emitted later.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::save(Symbol* sym, Relobj* object,
|
|
unsigned int shndx,
|
|
Output_section* output_section,
|
|
const Reloc& rel)
|
|
{
|
|
unsigned int reloc_type = elfcpp::elf_r_type<size>(rel.get_r_info());
|
|
typename elfcpp::Elf_types<size>::Elf_Addr addend =
|
|
Reloc_types<sh_type, size, big_endian>::get_reloc_addend_noerror(&rel);
|
|
this->entries_.push_back(Copy_reloc_entry(sym, reloc_type, object, shndx,
|
|
output_section, rel.get_r_offset(),
|
|
addend));
|
|
}
|
|
|
|
// Emit any saved relocs.
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
void
|
|
Copy_relocs<sh_type, size, big_endian>::emit(
|
|
Output_data_reloc<sh_type, true, size, big_endian>* reloc_section)
|
|
{
|
|
for (typename Copy_reloc_entries::iterator p = this->entries_.begin();
|
|
p != this->entries_.end();
|
|
++p)
|
|
p->emit(reloc_section);
|
|
|
|
// We no longer need the saved information.
|
|
this->entries_.clear();
|
|
}
|
|
|
|
// Instantiate the templates we need.
|
|
|
|
#ifdef HAVE_TARGET_32_LITTLE
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_REL, 32, false>;
|
|
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_RELA, 32, false>;
|
|
#endif
|
|
|
|
#ifdef HAVE_TARGET_32_BIG
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_REL, 32, true>;
|
|
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_RELA, 32, true>;
|
|
#endif
|
|
|
|
#ifdef HAVE_TARGET_64_LITTLE
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_REL, 64, false>;
|
|
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_RELA, 64, false>;
|
|
#endif
|
|
|
|
#ifdef HAVE_TARGET_64_BIG
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_REL, 64, true>;
|
|
|
|
template
|
|
class Copy_relocs<elfcpp::SHT_RELA, 64, true>;
|
|
#endif
|
|
|
|
} // End namespace gold.
|