X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Freloc.cc;h=ca7f32fd698781768587c216ea07993ce8f93da3;hb=7903e5309890633911c91539e23a407e1f74b959;hp=ac7eb462fef78f3d01b14e9b97d2141c07d8fabf;hpb=9b547ce6834ed6367db2e76b2c4c2e99b188fc9b;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/reloc.cc b/gold/reloc.cc index ac7eb462fe..ca7f32fd69 100644 --- a/gold/reloc.cc +++ b/gold/reloc.cc @@ -1,6 +1,6 @@ // reloc.cc -- relocate input files for gold. -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -56,7 +56,9 @@ Read_relocs::is_runnable() void Read_relocs::locks(Task_locker* tl) { - tl->add(this, this->object_->token()); + Task_token* token = this->object_->token(); + if (token != NULL) + tl->add(this, token); } // Read the relocations and then start a Scan_relocs_task. @@ -172,7 +174,9 @@ Scan_relocs::is_runnable() void Scan_relocs::locks(Task_locker* tl) { - tl->add(this, this->object_->token()); + Task_token* token = this->object_->token(); + if (token != NULL) + tl->add(this, token); tl->add(this, this->next_blocker_); } @@ -222,7 +226,9 @@ Relocate_task::locks(Task_locker* tl) if (this->input_sections_blocker_ != NULL) tl->add(this, this->input_sections_blocker_); tl->add(this, this->final_blocker_); - tl->add(this, this->object_->token()); + Task_token* token = this->object_->token(); + if (token != NULL) + tl->add(this, token); } // Run the task. @@ -252,7 +258,7 @@ Relocate_task::get_name() const template void -Sized_relobj::do_read_relocs(Read_relocs_data* rd) +Sized_relobj_file::do_read_relocs(Read_relocs_data* rd) { rd->relocs.clear(); @@ -263,7 +269,7 @@ Sized_relobj::do_read_relocs(Read_relocs_data* rd) rd->relocs.reserve(shnum / 2); const Output_sections& out_sections(this->output_sections()); - const std::vector
& out_offsets(this->section_offsets_); + const std::vector
& out_offsets(this->section_offsets()); const unsigned char* pshdrs = this->get_view(this->elf_file_.shoff(), shnum * This::shdr_size, @@ -316,6 +322,9 @@ Sized_relobj::do_read_relocs(Read_relocs_data* rd) off_t sh_size = shdr.get_sh_size(); + if (sh_size == 0) + continue; + unsigned int reloc_size; if (sh_type == elfcpp::SHT_REL) reloc_size = elfcpp::Elf_sizes::rel_size; @@ -374,9 +383,9 @@ Sized_relobj::do_read_relocs(Read_relocs_data* rd) template void -Sized_relobj::do_gc_process_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd) +Sized_relobj_file::do_gc_process_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd) { Sized_target* target = parameters->sized_target(); @@ -414,7 +423,7 @@ Sized_relobj::do_gc_process_relocs(Symbol_table* symtab, template void -Sized_relobj::do_scan_relocs(Symbol_table* symtab, +Sized_relobj_file::do_scan_relocs(Symbol_table* symtab, Layout* layout, Read_relocs_data* rd) { @@ -483,7 +492,7 @@ Sized_relobj::do_scan_relocs(Symbol_table* symtab, // For incremental links, finalize the allocation of relocations. if (layout->incremental_inputs() != NULL) - this->finalize_incremental_relocs(layout); + this->finalize_incremental_relocs(layout, true); if (rd->local_symbols != NULL) { @@ -531,7 +540,7 @@ class Emit_relocs_strategy template void -Sized_relobj::emit_relocs_scan( +Sized_relobj_file::emit_relocs_scan( Symbol_table* symtab, Layout* layout, const unsigned char* plocal_syms, @@ -558,7 +567,7 @@ Sized_relobj::emit_relocs_scan( template template void -Sized_relobj::emit_relocs_scan_reltype( +Sized_relobj_file::emit_relocs_scan_reltype( Symbol_table* symtab, Layout* layout, const unsigned char* plocal_syms, @@ -584,7 +593,7 @@ Sized_relobj::emit_relocs_scan_reltype( template void -Sized_relobj::incremental_relocs_scan( +Sized_relobj_file::incremental_relocs_scan( const Read_relocs_data::Relocs_list::iterator& p) { if (p->sh_type == elfcpp::SHT_REL) @@ -596,13 +605,13 @@ Sized_relobj::incremental_relocs_scan( } } -// Scan the input relocation for --emit-relocs, templatized on the +// Scan the input relocation for --incremental, templatized on the // type of the relocation section. template template void -Sized_relobj::incremental_relocs_scan_reltype( +Sized_relobj_file::incremental_relocs_scan_reltype( const Read_relocs_data::Relocs_list::iterator& p) { typedef typename Reloc_types::Reloc Reltype; @@ -632,9 +641,9 @@ Sized_relobj::incremental_relocs_scan_reltype( template void -Sized_relobj::do_relocate(const Symbol_table* symtab, - const Layout* layout, - Output_file* of) +Sized_relobj_file::do_relocate(const Symbol_table* symtab, + const Layout* layout, + Output_file* of) { unsigned int shnum = this->shnum(); @@ -650,7 +659,7 @@ Sized_relobj::do_relocate(const Symbol_table* symtab, // section data to the output file. The second one applies // relocations. - this->write_sections(pshdrs, of, &views); + this->write_sections(layout, pshdrs, of, &views); // To speed up relocations, we set up hash tables for fast lookup of // input offsets to output addresses. @@ -669,6 +678,8 @@ Sized_relobj::do_relocate(const Symbol_table* symtab, { if (views[i].view != NULL) { + if (views[i].is_ctors_reverse_view) + this->reverse_words(views[i].view, views[i].view_size); if (!views[i].is_postprocessing_view) { if (views[i].is_input_output_view) @@ -684,10 +695,8 @@ Sized_relobj::do_relocate(const Symbol_table* symtab, // Write out the local symbols. this->write_local_symbols(of, layout->sympool(), layout->dynpool(), - layout->symtab_xindex(), layout->dynsym_xindex()); - - // We should no longer need the local symbol values. - this->clear_local_symbols(); + layout->symtab_xindex(), layout->dynsym_xindex(), + layout->symtab_section_offset()); } // Sort a Read_multiple vector by file offset. @@ -705,13 +714,14 @@ struct Read_multiple_compare template void -Sized_relobj::write_sections(const unsigned char* pshdrs, - Output_file* of, - Views* pviews) +Sized_relobj_file::write_sections(const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews) { unsigned int shnum = this->shnum(); const Output_sections& out_sections(this->output_sections()); - const std::vector
& out_offsets(this->section_offsets_); + const std::vector
& out_offsets(this->section_offsets()); File_read::Read_multiple rm; bool is_sorted = true; @@ -754,6 +764,7 @@ Sized_relobj::write_sections(const unsigned char* pshdrs, pvs->address = posd->address(); pvs->is_input_output_view = false; pvs->is_postprocessing_view = false; + pvs->is_ctors_reverse_view = false; continue; } @@ -868,6 +879,12 @@ Sized_relobj::write_sections(const unsigned char* pshdrs, pvs->view_size = view_size; pvs->is_input_output_view = output_offset == invalid_address; pvs->is_postprocessing_view = os->requires_postprocessing(); + pvs->is_ctors_reverse_view = + (!parameters->options().relocatable() + && view_size > size / 8 + && (strcmp(os->name(), ".init_array") == 0 + || strcmp(os->name(), ".fini_array") == 0) + && layout->is_ctors_in_init_array(this, i)); } // Actually read the data. @@ -884,7 +901,7 @@ Sized_relobj::write_sections(const unsigned char* pshdrs, template void -Sized_relobj::do_relocate_sections( +Sized_relobj_file::do_relocate_sections( const Symbol_table* symtab, const Layout* layout, const unsigned char* pshdrs, @@ -896,7 +913,7 @@ Sized_relobj::do_relocate_sections( parameters->sized_target(); const Output_sections& out_sections(this->output_sections()); - const std::vector
& out_offsets(this->section_offsets_); + const std::vector
& out_offsets(this->section_offsets()); Relocate_info relinfo; relinfo.symtab = symtab; @@ -997,9 +1014,14 @@ Sized_relobj::do_relocate_sections( output_offset == invalid_address, view, address, view_size, reloc_map); if (parameters->options().emit_relocs()) - this->emit_relocs(&relinfo, i, sh_type, prelocs, reloc_count, - os, output_offset, view, address, view_size, - (*pviews)[i].view, (*pviews)[i].view_size); + { + Relocatable_relocs* rr = this->relocatable_relocs(i); + target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count, + os, output_offset, rr, + view, address, view_size, + (*pviews)[i].view, + (*pviews)[i].view_size); + } if (parameters->incremental()) this->incremental_relocs_write(&relinfo, sh_type, prelocs, reloc_count, os, output_offset, of); @@ -1007,89 +1029,20 @@ Sized_relobj::do_relocate_sections( else { Relocatable_relocs* rr = this->relocatable_relocs(i); - target->relocate_for_relocatable(&relinfo, sh_type, prelocs, - reloc_count, os, output_offset, rr, - view, address, view_size, - (*pviews)[i].view, - (*pviews)[i].view_size); + target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count, + os, output_offset, rr, + view, address, view_size, + (*pviews)[i].view, + (*pviews)[i].view_size); } } } -// Emit the relocs for --emit-relocs. - -template -void -Sized_relobj::emit_relocs( - const Relocate_info* relinfo, - unsigned int i, - unsigned int sh_type, - const unsigned char* prelocs, - size_t reloc_count, - Output_section* output_section, - typename elfcpp::Elf_types::Elf_Addr offset_in_output_section, - unsigned char* view, - typename elfcpp::Elf_types::Elf_Addr address, - section_size_type view_size, - unsigned char* reloc_view, - section_size_type reloc_view_size) -{ - if (sh_type == elfcpp::SHT_REL) - this->emit_relocs_reltype(relinfo, i, prelocs, - reloc_count, output_section, - offset_in_output_section, - view, address, view_size, - reloc_view, reloc_view_size); - else - { - gold_assert(sh_type == elfcpp::SHT_RELA); - this->emit_relocs_reltype(relinfo, i, prelocs, - reloc_count, output_section, - offset_in_output_section, - view, address, view_size, - reloc_view, reloc_view_size); - } -} - -// Emit the relocs for --emit-relocs, templatized on the type of the -// relocation section. - -template -template -void -Sized_relobj::emit_relocs_reltype( - const Relocate_info* relinfo, - unsigned int i, - const unsigned char* prelocs, - size_t reloc_count, - Output_section* output_section, - typename elfcpp::Elf_types::Elf_Addr offset_in_output_section, - unsigned char* view, - typename elfcpp::Elf_types::Elf_Addr address, - section_size_type view_size, - unsigned char* reloc_view, - section_size_type reloc_view_size) -{ - const Relocatable_relocs* rr = this->relocatable_relocs(i); - relocate_for_relocatable( - relinfo, - prelocs, - reloc_count, - output_section, - offset_in_output_section, - rr, - view, - address, - view_size, - reloc_view, - reloc_view_size); -} - // Write the incremental relocs. template void -Sized_relobj::incremental_relocs_write( +Sized_relobj_file::incremental_relocs_write( const Relocate_info* relinfo, unsigned int sh_type, const unsigned char* prelocs, @@ -1125,7 +1078,7 @@ Sized_relobj::incremental_relocs_write( template template void -Sized_relobj::incremental_relocs_write_reltype( +Sized_relobj_file::incremental_relocs_write_reltype( const Relocate_info* relinfo, const unsigned char* prelocs, size_t reloc_count, @@ -1137,7 +1090,8 @@ Sized_relobj::incremental_relocs_write_reltype( const unsigned int reloc_size = Reloc_types::reloc_size; const unsigned int sizeof_addr = size / 8; - const unsigned int incr_reloc_size = 8 + 2 * sizeof_addr; + const unsigned int incr_reloc_size = + Incremental_relocs_reader::reloc_size; unsigned int out_shndx = output_section->out_shndx(); @@ -1210,7 +1164,7 @@ Sized_relobj::incremental_relocs_write_reltype( template void -Sized_relobj::initialize_input_to_output_maps() +Sized_relobj_file::initialize_input_to_output_maps() { const unsigned int loccount = this->local_symbol_count_; for (unsigned int i = 1; i < loccount; ++i) @@ -1224,7 +1178,7 @@ Sized_relobj::initialize_input_to_output_maps() template void -Sized_relobj::free_input_to_output_maps() +Sized_relobj_file::free_input_to_output_maps() { const unsigned int loccount = this->local_symbol_count_; for (unsigned int i = 1; i < loccount; ++i) @@ -1242,7 +1196,7 @@ Sized_relobj::free_input_to_output_maps() template void -Sized_relobj::split_stack_adjust( +Sized_relobj_file::split_stack_adjust( const Symbol_table* symtab, const unsigned char* pshdrs, unsigned int sh_type, @@ -1274,7 +1228,7 @@ Sized_relobj::split_stack_adjust( template template void -Sized_relobj::split_stack_adjust_reltype( +Sized_relobj_file::split_stack_adjust_reltype( const Symbol_table* symtab, const unsigned char* pshdrs, unsigned int shndx, @@ -1431,10 +1385,10 @@ Sized_relobj::split_stack_adjust_reltype( template void -Sized_relobj::find_functions( +Sized_relobj_file::find_functions( const unsigned char* pshdrs, unsigned int shndx, - Sized_relobj::Function_offsets* function_offsets) + Sized_relobj_file::Function_offsets* function_offsets) { // We need to read the symbols to find the functions. If we wanted // to, we could cache reading the symbols across all sections in the @@ -1475,6 +1429,26 @@ Sized_relobj::find_functions( } } +// Reverse the words in a section. Used for .ctors sections mapped to +// .init_array sections. See ctors_sections_in_init_array in +// layout.cc. + +template +void +Sized_relobj_file::reverse_words(unsigned char* view, + section_size_type view_size) +{ + typedef typename elfcpp::Swap::Valtype Valtype; + Valtype* vview = reinterpret_cast(view); + section_size_type vview_size = view_size / (size / 8); + for (section_size_type i = 0; i < vview_size / 2; ++i) + { + Valtype tmp = vview[i]; + vview[i] = vview[vview_size - 1 - i]; + vview[vview_size - 1 - i] = tmp; + } +} + // Class Merged_symbol_value. template @@ -1631,127 +1605,127 @@ Track_relocs::advance(off_t offset) #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::do_read_relocs(Read_relocs_data* rd); +Sized_relobj_file<32, false>::do_read_relocs(Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::do_read_relocs(Read_relocs_data* rd); +Sized_relobj_file<32, true>::do_read_relocs(Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::do_read_relocs(Read_relocs_data* rd); +Sized_relobj_file<64, false>::do_read_relocs(Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::do_read_relocs(Read_relocs_data* rd); +Sized_relobj_file<64, true>::do_read_relocs(Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::do_gc_process_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<32, false>::do_gc_process_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::do_gc_process_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<32, true>::do_gc_process_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::do_gc_process_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<64, false>::do_gc_process_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::do_gc_process_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<64, true>::do_gc_process_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::do_scan_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<32, false>::do_scan_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::do_scan_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<32, true>::do_scan_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::do_scan_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<64, false>::do_scan_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::do_scan_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd); +Sized_relobj_file<64, true>::do_scan_relocs(Symbol_table* symtab, + Layout* layout, + Read_relocs_data* rd); #endif #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::do_relocate(const Symbol_table* symtab, - const Layout* layout, - Output_file* of); +Sized_relobj_file<32, false>::do_relocate(const Symbol_table* symtab, + const Layout* layout, + Output_file* of); #endif #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::do_relocate(const Symbol_table* symtab, - const Layout* layout, - Output_file* of); +Sized_relobj_file<32, true>::do_relocate(const Symbol_table* symtab, + const Layout* layout, + Output_file* of); #endif #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::do_relocate(const Symbol_table* symtab, - const Layout* layout, - Output_file* of); +Sized_relobj_file<64, false>::do_relocate(const Symbol_table* symtab, + const Layout* layout, + Output_file* of); #endif #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::do_relocate(const Symbol_table* symtab, - const Layout* layout, - Output_file* of); +Sized_relobj_file<64, true>::do_relocate(const Symbol_table* symtab, + const Layout* layout, + Output_file* of); #endif #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::do_relocate_sections( +Sized_relobj_file<32, false>::do_relocate_sections( const Symbol_table* symtab, const Layout* layout, const unsigned char* pshdrs, @@ -1762,7 +1736,7 @@ Sized_relobj<32, false>::do_relocate_sections( #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::do_relocate_sections( +Sized_relobj_file<32, true>::do_relocate_sections( const Symbol_table* symtab, const Layout* layout, const unsigned char* pshdrs, @@ -1773,7 +1747,7 @@ Sized_relobj<32, true>::do_relocate_sections( #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::do_relocate_sections( +Sized_relobj_file<64, false>::do_relocate_sections( const Symbol_table* symtab, const Layout* layout, const unsigned char* pshdrs, @@ -1784,7 +1758,7 @@ Sized_relobj<64, false>::do_relocate_sections( #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::do_relocate_sections( +Sized_relobj_file<64, true>::do_relocate_sections( const Symbol_table* symtab, const Layout* layout, const unsigned char* pshdrs, @@ -1795,41 +1769,41 @@ Sized_relobj<64, true>::do_relocate_sections( #ifdef HAVE_TARGET_32_LITTLE template void -Sized_relobj<32, false>::initialize_input_to_output_maps(); +Sized_relobj_file<32, false>::initialize_input_to_output_maps(); template void -Sized_relobj<32, false>::free_input_to_output_maps(); +Sized_relobj_file<32, false>::free_input_to_output_maps(); #endif #ifdef HAVE_TARGET_32_BIG template void -Sized_relobj<32, true>::initialize_input_to_output_maps(); +Sized_relobj_file<32, true>::initialize_input_to_output_maps(); template void -Sized_relobj<32, true>::free_input_to_output_maps(); +Sized_relobj_file<32, true>::free_input_to_output_maps(); #endif #ifdef HAVE_TARGET_64_LITTLE template void -Sized_relobj<64, false>::initialize_input_to_output_maps(); +Sized_relobj_file<64, false>::initialize_input_to_output_maps(); template void -Sized_relobj<64, false>::free_input_to_output_maps(); +Sized_relobj_file<64, false>::free_input_to_output_maps(); #endif #ifdef HAVE_TARGET_64_BIG template void -Sized_relobj<64, true>::initialize_input_to_output_maps(); +Sized_relobj_file<64, true>::initialize_input_to_output_maps(); template void -Sized_relobj<64, true>::free_input_to_output_maps(); +Sized_relobj_file<64, true>::free_input_to_output_maps(); #endif #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)