From ef9beddf72634055b25a631850464a701599585c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 10 Jul 2008 23:01:20 +0000 Subject: Handle output sections with more than 0x7fffffff bytes. * object.h (class Relobj): Change map_to_output_ to output_sections_, and just keep a section pointer. Change all uses. Move comdat group support to Sized_relobj. (Relobj::is_section_specially_mapped): Remove. (Relobj::output_section): Remove poff parameter. Change all callers. (Relobj::output_section_offset): New function. (Relobj::set_section_offset): Rewrite. (Relobj::map_to_output): Remove. (Relobj::output_sections): New function. (Relobj::do_output_section_offset): New pure virtual function. (Relobj::do_set_section_offset): Likewise. (class Sized_relobj): Add section_offsets_ field. Add comdat group support from Relobj. Update declarations. (Sized_relobj::get_output_section_offset): New function. (Sized_relobj::do_output_section_offset): New function. (Sized_relobj::do_set_section_offset): New function. * object.cc (Relobj::output_section_address): Remove. (Sized_relobj::Sized_relobj): Initialize new fields. (Sized_relobj::include_section_group): Cast find_kept_object to Sized_relobj. (Sized_relobj::include_linkonce_section): Likewise. (Sized_relobj::do_layout): Use separate arrays for output section and output offset. (Sized_relobj::do_count_local_symbols): Change map_to_output to output_sections. (Sized_relobj::do_finalize_local_symbols): Change map_to_output to output_sections and section_offsets. (Sized_relobj::write_local_symbols): Likewise. (map_to_kept_section): Compute output address directly. * reloc.cc (Sized_relobj::do_read_relocs): Change map_to_output to output_sections and section_offsets. (Sized_relobj::write_sections): Likewise. (Sized_relobj::relocate_sections): Likewise. * symtab.cc (sized_finalize_symbol): Use output_section_offset. * output.h (class Output_reloc): Update declarations. Change u2_.relobj to Sized_relobj*. (class Output_data_reloc): Change add functions to use Sized_relobj*. * output.cc (Output_reloc::Output_reloc): Change relobj to Sized_relobj*. (Output_reloc::local_section_offset): Change return type to Elf_Addr. Use get_output_section_offset. (Output_reloc::get_address): Likewise. (Output_section::is_input_address_mapped): Don't call is_section_specially_mapped. (Output_section::output_offset): Likewise. (Output_section::output_address): Likewise. (Output_section::starting_output_address): Likewise. * copy-relocs.cc (Copy_relocs::copy_reloc): Change object parameter to Sized_relobj*. (Copy_relocs::need_copy_reloc): Likewise. (Copy_relocs::save): Likewise. * copy-relocs.h (class Copy_relocs): Update declarations. (class Copy_relocs::Copy_reloc_entry): Change constructor to use Sized_relobj*. Change relobj_ field to Sized_relobj*. * target-reloc.h (relocate_for_relocatable): Change offset_in_output_section type to Elf_Addr. Change code that uses it as well. * layout.cc (Layout::layout): Always set *off. * mapfile.cc (Mapfile::print_input_section): Use output_section_offset. * i386.cc (Target_i386::copy_reloc): Change object parameter to Sized_relobj*. * powerpc.cc (Target_powerpc::copy_reloc): Likewise. * sparc.cc (Target_sparc::copy_reloc): Likewise. * x86_64.cc (Target_x86_64::copy_reloc): Likewise. --- gold/output.h | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'gold/output.h') diff --git a/gold/output.h b/gold/output.h index 952f24f..e2c41c7 100644 --- a/gold/output.h +++ b/gold/output.h @@ -890,7 +890,8 @@ class Output_reloc Output_reloc(Symbol* gsym, unsigned int type, Output_data* od, Address address, bool is_relative); - Output_reloc(Symbol* gsym, unsigned int type, Relobj* relobj, + Output_reloc(Symbol* gsym, unsigned int type, + Sized_relobj* relobj, unsigned int shndx, Address address, bool is_relative); // A reloc against a local symbol or local section symbol. @@ -910,7 +911,8 @@ class Output_reloc Output_reloc(Output_section* os, unsigned int type, Output_data* od, Address address); - Output_reloc(Output_section* os, unsigned int type, Relobj* relobj, + Output_reloc(Output_section* os, unsigned int type, + Sized_relobj* relobj, unsigned int shndx, Address address); // Return TRUE if this is a RELATIVE relocation. @@ -931,7 +933,7 @@ class Output_reloc // For a local section symbol, return the offset of the input // section within the output section. ADDEND is the addend being // applied to the input section. - section_offset_type + Address local_section_offset(Addend addend) const; // Get the value of the symbol referred to by a Rel relocation when @@ -1004,7 +1006,7 @@ class Output_reloc { // If this->shndx_ is not INVALID CODE, the object which holds the // input section being used to specify the reloc address. - Relobj* relobj; + Sized_relobj* relobj; // If this->shndx_ is INVALID_CODE, the output data being used to // specify the reloc address. This may be NULL if the reloc // address is absolute. @@ -1053,7 +1055,8 @@ class Output_reloc : rel_(gsym, type, od, address, is_relative), addend_(addend) { } - Output_reloc(Symbol* gsym, unsigned int type, Relobj* relobj, + Output_reloc(Symbol* gsym, unsigned int type, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend, bool is_relative) : rel_(gsym, type, relobj, shndx, address, is_relative), addend_(addend) @@ -1086,7 +1089,8 @@ class Output_reloc : rel_(os, type, od, address), addend_(addend) { } - Output_reloc(Output_section* os, unsigned int type, Relobj* relobj, + Output_reloc(Output_section* os, unsigned int type, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) : rel_(os, type, relobj, shndx, address), addend_(addend) { } @@ -1215,7 +1219,8 @@ class Output_data_reloc { this->add(od, Output_reloc_type(gsym, type, od, address, false)); } void - add_global(Symbol* gsym, unsigned int type, Output_data* od, Relobj* relobj, + add_global(Symbol* gsym, unsigned int type, Output_data* od, + Sized_relobj* relobj, unsigned int shndx, Address address) { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, false)); } @@ -1231,7 +1236,8 @@ class Output_data_reloc } void - add_global(Symbol* gsym, unsigned int type, Output_data* od, Relobj* relobj, + add_global(Symbol* gsym, unsigned int type, Output_data* od, + Sized_relobj* relobj, unsigned int shndx, Address address, Address addend) { gold_assert(addend == 0); @@ -1248,7 +1254,8 @@ class Output_data_reloc void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Relobj* relobj, unsigned int shndx, Address address) + Sized_relobj* relobj, + unsigned int shndx, Address address) { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, true)); @@ -1327,7 +1334,8 @@ class Output_data_reloc void add_output_section(Output_section* os, unsigned int type, Output_data* od, - Relobj* relobj, unsigned int shndx, Address address) + Sized_relobj* relobj, + unsigned int shndx, Address address) { this->add(od, Output_reloc_type(os, type, relobj, shndx, address)); } }; @@ -1359,7 +1367,8 @@ class Output_data_reloc false)); } void - add_global(Symbol* gsym, unsigned int type, Output_data* od, Relobj* relobj, + add_global(Symbol* gsym, unsigned int type, Output_data* od, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, @@ -1377,8 +1386,8 @@ class Output_data_reloc void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Relobj* relobj, unsigned int shndx, Address address, - Addend addend) + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend) { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, addend, true)); } @@ -1455,7 +1464,8 @@ class Output_data_reloc { this->add(os, Output_reloc_type(os, type, od, address, addend)); } void - add_output_section(Output_section* os, unsigned int type, Relobj* relobj, + add_output_section(Output_section* os, unsigned int type, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) { this->add(os, Output_reloc_type(os, type, relobj, shndx, address, addend)); } -- cgit v1.1