From 6fa2a40bf45fcc738eb580a6b644ac74b42c2d6a Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Tue, 24 May 2011 21:41:10 +0000 Subject: * incremental-dump.cc (dump_incremental_inputs): Print dynamic reloc info; adjust display of GOT entries. * incremental.cc (Sized_incremental_binary::setup_readers): Allocate vector of input objects; remove file_status_. (Sized_incremental_binary::do_reserve_layout): Remove file_status_. (Sized_incremental_binary::do_process_got_plt): Adjust calls to got_plt reader; call target hooks to reserve GOT entries. (Output_section_incremental_inputs::set_final_data_size): Adjust size of input file info header and GOT info entry. (Output_section_incremental_inputs::write_info_blocks): Write dynamic relocation info. (Got_plt_view_info::got_descriptor): Remove. (Got_plt_view_info::sym_index): New data member. (Got_plt_view_info::input_index): New data member. (Local_got_offset_visitor::visit): Write input file index. (Global_got_offset_visitor::visit): Write 0 for input file index. (Global_symbol_visitor_got_plt::operator()): Replace got_descriptor with sym_index and input_index. (Output_section_incremental_inputs::write_got_plt): Adjust size of incremental info GOT entry; replace got_descriptor with input_index. (Sized_relobj_incr::Sized_relobj_incr): Adjust initializers; record map from input file index to object. (Sized_relobj_incr::do_layout): Replace direct data member reference with accessor function. (Sized_relobj_incr::do_for_all_local_got_entries): Move to base class. * incremental.h (Incremental_input_entry_reader::get_symbol_offset): Adjust size of input file info header. (Incremental_input_entry_reader::get_first_dyn_reloc): New function. (Incremental_input_entry_reader::get_dyn_reloc_count): New function. (Incremental_input_entry_reader::get_input_section): Adjust size of input file info header. (Incremental_got_plt_reader::Incremental_got_plt_reader): Adjust size of incremental info GOT entry. (Incremental_got_plt_reader::get_got_desc): Remove. (Incremental_got_plt_reader::get_got_symndx): New function. (Incremental_got_plt_reader::get_got_input_index): New function. (Sized_incremental_binary::Sized_incremental_binary): Remove file_status_; add input_objects_. (Sized_incremental_binary::~Sized_incremental_binary): Remove. (Sized_incremental_binary::set_file_is_unchanged): Remove. (Sized_incremental_binary::file_is_unchanged): Remove. (Sized_incremental_binary::set_input_object): New function. (Sized_incremental_binary::input_object): New function. (Sized_incremental_binary::file_status_): Remove. (Sized_incremental_binary::input_objects_): New data member. (Sized_relobj_incr): Rename Sized_incr_relobj to this; adjust all references. (Sized_relobj_incr::invalid_address): Move to base class. (Sized_relobj_incr::is_output_section_offset_invalid): Move to base class. (Sized_relobj_incr::do_output_section_offset): Likewise. (Sized_relobj_incr::do_for_all_local_got_entries): Likewise. (Sized_relobj_incr::section_offsets_): Likewise. * object.cc (Sized_relobj::do_for_all_local_got_entries): New function. (Sized_relobj_file::Sized_relobj_file): Remove local_got_offsets_. (Sized_relobj_file::layout_section): Replace refs to section_offsets_ with accessor function. (Sized_relobj_file::do_layout): Likewise. (Sized_relobj_file::do_layout_deferred_sections): Likewise. (Sized_relobj_file::do_for_all_local_got_entries): Move to base class. (Sized_relobj_file::compute_final_local_value): Replace refs to section_offsets_ with accessor function. (Sized_relobj_file::do_finalize_local_symbols): Likewise. * object.h (Relobj::Relobj): Initialize new data members. (Relobj::add_dyn_reloc): New function. (Relobj::first_dyn_reloc): New function. (Relobj::dyn_reloc_count): New function. (Relobj::first_dyn_reloc_): New data member. (Relobj::dyn_reloc_count_): New data member. (Sized_relobj): Rename Sized_relobj_base to this; adjust all references. (Sized_relobj::Address): New typedef. (Sized_relobj::invalid_address): Move here from child class. (Sized_relobj::Sized_relobj): Initialize new data members. (Sized_relobj::sized_relobj): New function. (Sized_relobj::is_output_section_offset_invalid): Move here from child class. (Sized_relobj::get_output_section_offset): Likewise. (Sized_relobj::local_has_got_offset): Likewise. (Sized_relobj::local_got_offset): Likewise. (Sized_relobj::set_local_got_offset): Likewise. (Sized_relobj::do_for_all_local_got_entries): Likewise. (Sized_relobj::clear_got_offsets): New function. (Sized_relobj::section_offsets): Move here from child class. (Sized_relobj::do_output_section_offset): Likewise. (Sized_relobj::do_set_section_offset): Likewise. (Sized_relobj::Local_got_offsets): Likewise. (Sized_relobj::local_got_offsets_): Likewise. (Sized_relobj::section_offsets_): Likewise. (Sized_relobj_file): Rename Sized_relobj to this; adjust all references. (Sized_relobj_file::is_output_section_offset_invalid): Move to base class. (Sized_relobj_file::sized_relobj): New function (Sized_relobj_file::local_has_got_offset): Move to base class. (Sized_relobj_file::local_got_offset): Likewise. (Sized_relobj_file::set_local_got_offset): Likewise. (Sized_relobj_file::get_output_section_offset): Likewise. (Sized_relobj_file::do_for_all_local_got_entries): Likewise. (Sized_relobj_file::do_output_section_offset): Likewise. (Sized_relobj_file::do_set_section_offset): Likewise. (Sized_relobj_file::Local_got_offsets): Likewise. (Sized_relobj_file::local_got_offsets_): Likewise. (Sized_relobj_file::section_offsets_): Likewise. * output.cc (Output_reloc::Output_reloc): Adjust type of relobj (all constructors). (set_needs_dynsym_index): Convert relobj to derived class pointer. (Output_reloc::get_symbol_index): Likewise. (Output_reloc::local_section_offset): Likewise. (Output_reloc::get_address): Likewise. (Output_reloc::symbol_value): Likewise. (Output_data_got::reserve_slot): Move to class definition. (Output_data_got::reserve_local): New function. (Output_data_got::reserve_slot_for_global): Remove. (Output_data_got::reserve_global): New function. * output.h (Output_reloc::Output_reloc): Adjust type of relobj (all constructors, two instantiations). (Output_reloc::get_relobj): New function (two instantiations). (Output_reloc::u1_.relobj, Output_reloc::u2_.relobj): Adjust type. (Output_data_reloc_base::add): Convert relobj to derived class pointer. (Output_data_reloc::add_global): Adjust type of relobj. (Output_data_reloc::add_global_relative): Likewise. (Output_data_reloc::add_symbolless_global_addend): Likewise. (Output_data_reloc::add_local): Likewise. (Output_data_reloc::add_local_relative): Likewise. (Output_data_reloc::add_symbolless_local_addend): Likewise. (Output_data_reloc::add_local_section): Likewise. (Output_data_reloc::add_output_section): Likewise. (Output_data_reloc::add_absolute): Likewise. (Output_data_reloc::add_target_specific): Likewise. (Output_data_got::reserve_slot): Move definition here. (Output_data_got::reserve_local): New function. (Output_data_got::reserve_global): New function. * reloc.cc (Sized_relobj_file::do_read_relocs): Replace refs to section_offsets_ with accessor function. (Sized_relobj_file::write_sections): Likewise. (Sized_relobj_file::do_relocate_sections): Likewise. * target.h (Sized_target::reserve_local_got_entry): New function. (Sized_target::reserve_global_got_entry): New function. * x86_64.cc (Target_x86_64::reserve_local_got_entry): New function. (Target_x86_64::reserve_global_got_entry): New function. (Target_x86_64::init_got_plt_for_update): Create rela_dyn section. --- gold/incremental.cc | 166 +++++++++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 85 deletions(-) (limited to 'gold/incremental.cc') diff --git a/gold/incremental.cc b/gold/incremental.cc index b831b97..d49c8a5 100644 --- a/gold/incremental.cc +++ b/gold/incremental.cc @@ -276,6 +276,7 @@ Sized_incremental_binary::setup_readers() // libraries and scripts. Incremental_inputs_reader& inputs = this->inputs_reader_; unsigned int count = inputs.input_file_count(); + this->input_objects_.resize(count); this->input_entry_readers_.reserve(count); this->library_map_.resize(count); this->script_map_.resize(count); @@ -327,10 +328,6 @@ Sized_incremental_binary::setup_readers() unsigned int nglobals = this->symtab_reader_.symbol_count(); this->symbol_map_.resize(nglobals); - // Initialize the status of each input file. - this->file_status_ = new unsigned char[(count + 7) / 8]; - memset(this->file_status_, 0, (count + 7) / 8); - this->has_incremental_info_ = true; } @@ -524,8 +521,6 @@ Sized_incremental_binary::do_reserve_layout( Input_entry_reader input_file = this->inputs_reader_.input_file(input_file_index); - this->set_file_is_unchanged(input_file_index); - if (input_file.type() == INCREMENTAL_INPUT_SHARED_LIBRARY) return; @@ -579,29 +574,31 @@ Sized_incremental_binary::do_process_got_plt( got->reserve_slot(i); continue; } - unsigned int got_desc = got_plt_reader.get_got_desc(i); + unsigned int symndx = got_plt_reader.get_got_symndx(i); if (got_type & 0x80) { - // This is an entry for a local symbol. GOT_DESC is the index - // of the object file entry in the list of input files. Ignore - // this entry if the object file was replaced. + // This is an entry for a local symbol. Ignore this entry if + // the object file was replaced. + unsigned int input_index = got_plt_reader.get_got_input_index(i); gold_debug(DEBUG_INCREMENTAL, "GOT entry %d, type %02x: (local symbol)", i, got_type & 0x7f); - if (this->file_is_unchanged(got_desc)) - got->reserve_slot(i); + Sized_relobj_incr* obj = + this->input_object(input_index); + if (obj != NULL) + target->reserve_local_got_entry(i, obj, symndx, got_type & 0x7f); } else { // This is an entry for a global symbol. GOT_DESC is the symbol // table index. // FIXME: This should really be a fatal error (corrupt input). - gold_assert(got_desc >= first_global && got_desc < symtab_count); - Symbol* sym = this->global_symbol(got_desc - first_global); + gold_assert(symndx >= first_global && symndx < symtab_count); + Symbol* sym = this->global_symbol(symndx - first_global); gold_debug(DEBUG_INCREMENTAL, "GOT entry %d, type %02x: %s", i, got_type, sym->name()); - got->reserve_slot_for_global(i, sym, got_type); + target->reserve_global_got_entry(i, sym, got_type); } } @@ -1146,8 +1143,8 @@ Output_section_incremental_inputs::set_final_data_size() gold_assert(entry != NULL); (*p)->set_info_offset(info_offset); // Input section count, global symbol count, local symbol offset, - // local symbol count. - info_offset += 16; + // local symbol count, first dynamic reloc, dynamic reloc count. + info_offset += 24; // Each input section. info_offset += (entry->get_input_section_count() * (8 + 2 * sizeof_addr)); @@ -1216,7 +1213,7 @@ Output_section_incremental_inputs::set_final_data_size() unsigned int plt_count = target->plt_entry_count(); unsigned int got_plt_size = 8; // GOT entry count, PLT entry count. got_plt_size = (got_plt_size + got_count + 3) & ~3; // GOT type array. - got_plt_size += got_count * 4 + plt_count * 4; // GOT array, PLT array. + got_plt_size += got_count * 8 + plt_count * 4; // GOT array, PLT array. inputs->got_plt_section()->set_current_data_size(got_plt_size); } @@ -1393,11 +1390,15 @@ Output_section_incremental_inputs::write_info_blocks( unsigned int nsyms = syms->size(); off_t locals_offset = relobj->local_symbol_offset(); unsigned int nlocals = relobj->output_local_symbol_count(); + unsigned int first_dynrel = relobj->first_dyn_reloc(); + unsigned int ndynrel = relobj->dyn_reloc_count(); Swap32::writeval(pov, nsections); Swap32::writeval(pov + 4, nsyms); Swap32::writeval(pov + 8, static_cast(locals_offset)); Swap32::writeval(pov + 12, nlocals); - pov += 16; + Swap32::writeval(pov + 16, first_dynrel); + Swap32::writeval(pov + 20, ndynrel); + pov += 24; // Build a temporary array to map input section indexes // from the original object file index to the index in the @@ -1592,11 +1593,14 @@ struct Got_plt_view_info unsigned int first_plt_entry_offset; // Size of a PLT entry (this is a target-dependent value). unsigned int plt_entry_size; - // Value to write in the GOT descriptor array. For global symbols, - // this is the global symbol table index; for local symbols, it is - // the offset of the input file entry in the .gnu_incremental_inputs - // section. - unsigned int got_descriptor; + // Symbol index to write in the GOT descriptor array. For global symbols, + // this is the global symbol table index; for local symbols, it is the + // local symbol table index. + unsigned int sym_index; + // Input file index to write in the GOT descriptor array. For global + // symbols, this is 0; for local symbols, it is the index of the input + // file entry in the .gnu_incremental_inputs section. + unsigned int input_index; }; // Functor class for processing a GOT offset list for local symbols. @@ -1621,8 +1625,9 @@ class Local_got_offset_visitor : public Got_offset_list::Visitor // high bit to flag a local symbol. gold_assert(got_type < 0x7f); this->info_.got_type_p[got_index] = got_type | 0x80; - unsigned char* pov = this->info_.got_desc_p + got_index * 4; - elfcpp::Swap<32, big_endian>::writeval(pov, this->info_.got_descriptor); + unsigned char* pov = this->info_.got_desc_p + got_index * 8; + elfcpp::Swap<32, big_endian>::writeval(pov, this->info_.sym_index); + elfcpp::Swap<32, big_endian>::writeval(pov + 4, this->info_.input_index); } private: @@ -1652,8 +1657,9 @@ class Global_got_offset_visitor : public Got_offset_list::Visitor // high bit to flag a local symbol. gold_assert(got_type < 0x7f); this->info_.got_type_p[got_index] = got_type; - unsigned char* pov = this->info_.got_desc_p + got_index * 4; - elfcpp::Swap<32, big_endian>::writeval(pov, this->info_.got_descriptor); + unsigned char* pov = this->info_.got_desc_p + got_index * 8; + elfcpp::Swap<32, big_endian>::writeval(pov, this->info_.sym_index); + elfcpp::Swap<32, big_endian>::writeval(pov + 4, 0); } private: @@ -1680,7 +1686,8 @@ class Global_symbol_visitor_got_plt const Got_offset_list* got_offsets = sym->got_offset_list(); if (got_offsets != NULL) { - this->info_.got_descriptor = sym->symtab_index(); + this->info_.sym_index = sym->symtab_index(); + this->info_.input_index = 0; Got_visitor v(this->info_); got_offsets->for_all_got_offsets(&v); } @@ -1719,7 +1726,7 @@ Output_section_incremental_inputs::write_got_plt( view_info.got_type_p = pov + 8; view_info.got_desc_p = (view_info.got_type_p + ((view_info.got_count + 3) & ~3)); - view_info.plt_desc_p = view_info.got_desc_p + view_info.got_count * 4; + view_info.plt_desc_p = view_info.got_desc_p + view_info.got_count * 8; gold_assert(pov + view_size == view_info.plt_desc_p + view_info.plt_count * 4); @@ -1745,7 +1752,7 @@ Output_section_incremental_inputs::write_got_plt( gold_assert(entry != NULL); const Object* obj = entry->object(); gold_assert(obj != NULL); - view_info.got_descriptor = (*p)->get_file_index(); + view_info.input_index = (*p)->get_file_index(); Got_visitor v(view_info); obj->for_all_local_got_entries(&v); } @@ -1755,35 +1762,35 @@ Output_section_incremental_inputs::write_got_plt( symtab_->for_all_symbols(Symbol_visitor(view_info)); } -// Class Sized_incr_relobj. Most of these methods are not used for +// Class Sized_relobj_incr. Most of these methods are not used for // Incremental objects, but are required to be implemented by the // base class Object. template -Sized_incr_relobj::Sized_incr_relobj( +Sized_relobj_incr::Sized_relobj_incr( const std::string& name, Sized_incremental_binary* ibase, unsigned int input_file_index) - : Sized_relobj_base(name, NULL), ibase_(ibase), + : Sized_relobj(name, NULL), ibase_(ibase), input_file_index_(input_file_index), input_reader_(ibase->inputs_reader().input_file(input_file_index)), local_symbol_count_(0), output_local_dynsym_count_(0), local_symbol_index_(0), local_symbol_offset_(0), local_dynsym_offset_(0), - symbols_(), section_offsets_(), incr_reloc_offset_(-1U), - incr_reloc_count_(0), incr_reloc_output_index_(0), incr_relocs_(NULL), - local_symbols_() + symbols_(), incr_reloc_offset_(-1U), incr_reloc_count_(0), + incr_reloc_output_index_(0), incr_relocs_(NULL), local_symbols_() { if (this->input_reader_.is_in_system_directory()) this->set_is_in_system_directory(); const unsigned int shnum = this->input_reader_.get_input_section_count() + 1; this->set_shnum(shnum); + ibase->set_input_object(input_file_index, this); } // Read the symbols. template void -Sized_incr_relobj::do_read_symbols(Read_symbols_data*) +Sized_relobj_incr::do_read_symbols(Read_symbols_data*) { gold_unreachable(); } @@ -1792,7 +1799,7 @@ Sized_incr_relobj::do_read_symbols(Read_symbols_data*) template void -Sized_incr_relobj::do_layout( +Sized_relobj_incr::do_layout( Symbol_table*, Layout* layout, Read_symbols_data*) @@ -1802,7 +1809,7 @@ Sized_incr_relobj::do_layout( gold_assert(incremental_inputs != NULL); Output_sections& out_sections(this->output_sections()); out_sections.resize(shnum); - this->section_offsets_.resize(shnum); + this->section_offsets().resize(shnum); for (unsigned int i = 1; i < shnum; i++) { typename Input_entry_reader::Input_section_info sect = @@ -1815,7 +1822,7 @@ Sized_incr_relobj::do_layout( Output_section* os = this->ibase_->output_section(sect.output_shndx); gold_assert(os != NULL); out_sections[i] = os; - this->section_offsets_[i] = static_cast
(sect.sh_offset); + this->section_offsets()[i] = static_cast
(sect.sh_offset); } } @@ -1823,7 +1830,7 @@ Sized_incr_relobj::do_layout( // input files from a plugin. template void -Sized_incr_relobj::do_layout_deferred_sections(Layout*) +Sized_relobj_incr::do_layout_deferred_sections(Layout*) { } @@ -1831,7 +1838,7 @@ Sized_incr_relobj::do_layout_deferred_sections(Layout*) template void -Sized_incr_relobj::do_add_symbols( +Sized_relobj_incr::do_add_symbols( Symbol_table* symtab, Read_symbols_data*, Layout*) @@ -1916,7 +1923,7 @@ Sized_incr_relobj::do_add_symbols( template Archive::Should_include -Sized_incr_relobj::do_should_include_member( +Sized_relobj_incr::do_should_include_member( Symbol_table*, Layout*, Read_symbols_data*, @@ -1929,29 +1936,18 @@ Sized_incr_relobj::do_should_include_member( template void -Sized_incr_relobj::do_for_all_global_symbols( +Sized_relobj_incr::do_for_all_global_symbols( Read_symbols_data*, Library_base::Symbol_visitor_base*) { // This routine is not used for incremental objects. } -// Iterate over local symbols, calling a visitor class V for each GOT offset -// associated with a local symbol. - -template -void -Sized_incr_relobj::do_for_all_local_got_entries( - Got_offset_list::Visitor*) const -{ - // FIXME: Implement Sized_incr_relobj::do_for_all_local_got_entries. -} - // Get the size of a section. template uint64_t -Sized_incr_relobj::do_section_size(unsigned int) +Sized_relobj_incr::do_section_size(unsigned int) { gold_unreachable(); } @@ -1960,7 +1956,7 @@ Sized_incr_relobj::do_section_size(unsigned int) template std::string -Sized_incr_relobj::do_section_name(unsigned int) +Sized_relobj_incr::do_section_name(unsigned int) { gold_unreachable(); } @@ -1969,7 +1965,7 @@ Sized_incr_relobj::do_section_name(unsigned int) template Object::Location -Sized_incr_relobj::do_section_contents(unsigned int) +Sized_relobj_incr::do_section_contents(unsigned int) { gold_unreachable(); } @@ -1978,7 +1974,7 @@ Sized_incr_relobj::do_section_contents(unsigned int) template uint64_t -Sized_incr_relobj::do_section_flags(unsigned int) +Sized_relobj_incr::do_section_flags(unsigned int) { gold_unreachable(); } @@ -1987,7 +1983,7 @@ Sized_incr_relobj::do_section_flags(unsigned int) template uint64_t -Sized_incr_relobj::do_section_entsize(unsigned int) +Sized_relobj_incr::do_section_entsize(unsigned int) { gold_unreachable(); } @@ -1996,7 +1992,7 @@ Sized_incr_relobj::do_section_entsize(unsigned int) template uint64_t -Sized_incr_relobj::do_section_address(unsigned int) +Sized_relobj_incr::do_section_address(unsigned int) { gold_unreachable(); } @@ -2005,7 +2001,7 @@ Sized_incr_relobj::do_section_address(unsigned int) template unsigned int -Sized_incr_relobj::do_section_type(unsigned int) +Sized_relobj_incr::do_section_type(unsigned int) { gold_unreachable(); } @@ -2014,7 +2010,7 @@ Sized_incr_relobj::do_section_type(unsigned int) template unsigned int -Sized_incr_relobj::do_section_link(unsigned int) +Sized_relobj_incr::do_section_link(unsigned int) { gold_unreachable(); } @@ -2023,7 +2019,7 @@ Sized_incr_relobj::do_section_link(unsigned int) template unsigned int -Sized_incr_relobj::do_section_info(unsigned int) +Sized_relobj_incr::do_section_info(unsigned int) { gold_unreachable(); } @@ -2032,7 +2028,7 @@ Sized_incr_relobj::do_section_info(unsigned int) template uint64_t -Sized_incr_relobj::do_section_addralign(unsigned int) +Sized_relobj_incr::do_section_addralign(unsigned int) { gold_unreachable(); } @@ -2041,7 +2037,7 @@ Sized_incr_relobj::do_section_addralign(unsigned int) template Xindex* -Sized_incr_relobj::do_initialize_xindex() +Sized_relobj_incr::do_initialize_xindex() { gold_unreachable(); } @@ -2050,7 +2046,7 @@ Sized_incr_relobj::do_initialize_xindex() template void -Sized_incr_relobj::do_get_global_symbol_counts( +Sized_relobj_incr::do_get_global_symbol_counts( const Symbol_table*, size_t*, size_t*) const { gold_unreachable(); @@ -2060,7 +2056,7 @@ Sized_incr_relobj::do_get_global_symbol_counts( template void -Sized_incr_relobj::do_read_relocs(Read_relocs_data*) +Sized_relobj_incr::do_read_relocs(Read_relocs_data*) { } @@ -2069,7 +2065,7 @@ Sized_incr_relobj::do_read_relocs(Read_relocs_data*) template void -Sized_incr_relobj::do_gc_process_relocs(Symbol_table*, +Sized_relobj_incr::do_gc_process_relocs(Symbol_table*, Layout*, Read_relocs_data*) { @@ -2080,7 +2076,7 @@ Sized_incr_relobj::do_gc_process_relocs(Symbol_table*, template void -Sized_incr_relobj::do_scan_relocs(Symbol_table*, +Sized_relobj_incr::do_scan_relocs(Symbol_table*, Layout* layout, Read_relocs_data*) { @@ -2125,7 +2121,7 @@ Sized_incr_relobj::do_scan_relocs(Symbol_table*, template void -Sized_incr_relobj::do_count_local_symbols( +Sized_relobj_incr::do_count_local_symbols( Stringpool_template* pool, Stringpool_template*) { @@ -2166,7 +2162,7 @@ Sized_incr_relobj::do_count_local_symbols( template unsigned int -Sized_incr_relobj::do_finalize_local_symbols( +Sized_relobj_incr::do_finalize_local_symbols( unsigned int index, off_t off, Symbol_table*) @@ -2180,7 +2176,7 @@ Sized_incr_relobj::do_finalize_local_symbols( template unsigned int -Sized_incr_relobj::do_set_local_dynsym_indexes( +Sized_relobj_incr::do_set_local_dynsym_indexes( unsigned int index) { // FIXME: set local dynsym indexes. @@ -2191,7 +2187,7 @@ Sized_incr_relobj::do_set_local_dynsym_indexes( template unsigned int -Sized_incr_relobj::do_set_local_dynsym_offset(off_t) +Sized_relobj_incr::do_set_local_dynsym_offset(off_t) { return 0; } @@ -2204,7 +2200,7 @@ Sized_incr_relobj::do_set_local_dynsym_offset(off_t) template void -Sized_incr_relobj::do_relocate(const Symbol_table*, +Sized_relobj_incr::do_relocate(const Symbol_table*, const Layout* layout, Output_file* of) { @@ -2330,7 +2326,7 @@ Sized_incr_relobj::do_relocate(const Symbol_table*, template void -Sized_incr_relobj::do_set_section_offset(unsigned int, +Sized_relobj_incr::do_set_section_offset(unsigned int, uint64_t) { } @@ -2617,7 +2613,7 @@ make_sized_incremental_object( obj = new Sized_incr_dynobj<32, false>(name, sized_ibase, input_file_index); else - obj = new Sized_incr_relobj<32, false>(name, sized_ibase, + obj = new Sized_relobj_incr<32, false>(name, sized_ibase, input_file_index); } break; @@ -2631,7 +2627,7 @@ make_sized_incremental_object( obj = new Sized_incr_dynobj<32, true>(name, sized_ibase, input_file_index); else - obj = new Sized_incr_relobj<32, true>(name, sized_ibase, + obj = new Sized_relobj_incr<32, true>(name, sized_ibase, input_file_index); } break; @@ -2645,7 +2641,7 @@ make_sized_incremental_object( obj = new Sized_incr_dynobj<64, false>(name, sized_ibase, input_file_index); else - obj = new Sized_incr_relobj<64, false>(name, sized_ibase, + obj = new Sized_relobj_incr<64, false>(name, sized_ibase, input_file_index); } break; @@ -2659,7 +2655,7 @@ make_sized_incremental_object( obj = new Sized_incr_dynobj<64, true>(name, sized_ibase, input_file_index); else - obj = new Sized_incr_relobj<64, true>(name, sized_ibase, + obj = new Sized_relobj_incr<64, true>(name, sized_ibase, input_file_index); } break; @@ -2705,7 +2701,7 @@ template class Sized_incremental_binary<32, false>; template -class Sized_incr_relobj<32, false>; +class Sized_relobj_incr<32, false>; template class Sized_incr_dynobj<32, false>; @@ -2716,7 +2712,7 @@ template class Sized_incremental_binary<32, true>; template -class Sized_incr_relobj<32, true>; +class Sized_relobj_incr<32, true>; template class Sized_incr_dynobj<32, true>; @@ -2727,7 +2723,7 @@ template class Sized_incremental_binary<64, false>; template -class Sized_incr_relobj<64, false>; +class Sized_relobj_incr<64, false>; template class Sized_incr_dynobj<64, false>; @@ -2738,7 +2734,7 @@ template class Sized_incremental_binary<64, true>; template -class Sized_incr_relobj<64, true>; +class Sized_relobj_incr<64, true>; template class Sized_incr_dynobj<64, true>; -- cgit v1.1