X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Freloc.cc;h=40d8f39d99cf54ce08622a0f6b7b0c6affd3f856;hb=7190276c52b9d86a52aae73d3a0f8b56e7a1f4f1;hp=910c4ee9ed36b406f5f615f1e09779f10e02e8fa;hpb=dbe40a889191708b6e32441b1c64937844645574;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/reloc.cc b/gold/reloc.cc index 910c4ee9ed..40d8f39d99 100644 --- a/gold/reloc.cc +++ b/gold/reloc.cc @@ -1,6 +1,6 @@ // reloc.cc -- relocate input files for gold. -// Copyright (C) 2006-2015 Free Software Foundation, Inc. +// Copyright (C) 2006-2019 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -424,8 +424,8 @@ Sized_relobj_file::do_gc_process_relocs(Symbol_table* symtab, template void Sized_relobj_file::do_scan_relocs(Symbol_table* symtab, - Layout* layout, - Read_relocs_data* rd) + Layout* layout, + Read_relocs_data* rd) { Sized_target* target = parameters->sized_target(); @@ -501,41 +501,6 @@ Sized_relobj_file::do_scan_relocs(Symbol_table* symtab, } } -// This is a strategy class we use when scanning for --emit-relocs. - -template -class Emit_relocs_strategy -{ - public: - // A local non-section symbol. - inline Relocatable_relocs::Reloc_strategy - local_non_section_strategy(unsigned int, Relobj*, unsigned int) - { return Relocatable_relocs::RELOC_COPY; } - - // A local section symbol. - inline Relocatable_relocs::Reloc_strategy - local_section_strategy(unsigned int, Relobj*) - { - if (sh_type == elfcpp::SHT_RELA) - return Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_RELA; - else - { - // The addend is stored in the section contents. Since this - // is not a relocatable link, we are going to apply the - // relocation contents to the section as usual. This means - // that we have no way to record the original addend. If the - // original addend is not zero, there is basically no way for - // the user to handle this correctly. Caveat emptor. - return Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_0; - } - } - - // A global symbol. - inline Relocatable_relocs::Reloc_strategy - global_strategy(unsigned int, Relobj*, unsigned int) - { return Relocatable_relocs::RELOC_COPY; } -}; - // Scan the input relocations for --emit-relocs. template @@ -546,40 +511,18 @@ Sized_relobj_file::emit_relocs_scan( const unsigned char* plocal_syms, const Read_relocs_data::Relocs_list::iterator& p) { + Sized_target* target = + parameters->sized_target(); + Relocatable_relocs* rr = this->relocatable_relocs(p->reloc_shndx); gold_assert(rr != NULL); rr->set_reloc_count(p->reloc_count); - - if (p->sh_type == elfcpp::SHT_REL) - this->emit_relocs_scan_reltype(symtab, layout, - plocal_syms, p, rr); - else - { - gold_assert(p->sh_type == elfcpp::SHT_RELA); - this->emit_relocs_scan_reltype(symtab, layout, - plocal_syms, p, rr); - } -} - -// Scan the input relocation for --emit-relocs, templatized on the -// type of the relocation section. - -template -template -void -Sized_relobj_file::emit_relocs_scan_reltype( - Symbol_table* symtab, - Layout* layout, - const unsigned char* plocal_syms, - const Read_relocs_data::Relocs_list::iterator& p, - Relocatable_relocs* rr) -{ - scan_relocatable_relocs >( + target->emit_relocs_scan( symtab, layout, this, p->data_shndx, + p->sh_type, p->contents->data(), p->reloc_count, p->output_section, @@ -628,8 +571,8 @@ Sized_relobj_file::incremental_relocs_scan_reltype( reloc.get_r_offset())) continue; - typename elfcpp::Elf_types::Elf_WXword r_info = - reloc.get_r_info(); + // FIXME: Some targets have a non-standard r_info field. + typename elfcpp::Elf_types::Elf_WXword r_info = reloc.get_r_info(); const unsigned int r_sym = elfcpp::elf_r_sym(r_info); if (r_sym >= this->local_symbol_count_) @@ -665,6 +608,24 @@ Sized_relobj_file::do_relocate(const Symbol_table* symtab, // input offsets to output addresses. this->initialize_input_to_output_maps(); + // Make the views available through get_output_view() for the duration + // of this routine. This RAII class will reset output_views_ to NULL + // when the views go out of scope. + struct Set_output_views + { + Set_output_views(const Views** ppviews, const Views* pviews) + { + ppviews_ = ppviews; + *ppviews = pviews; + } + + ~Set_output_views() + { *ppviews_ = NULL; } + + const Views** ppviews_; + }; + Set_output_views set_output_views(&this->output_views_, &views); + // Apply relocations. this->relocate_sections(symtab, layout, pshdrs, of, &views); @@ -866,7 +827,9 @@ Sized_relobj_file::write_sections(const Layout* layout, // Read and decompress the section. section_size_type len; const unsigned char* p = this->section_contents(i, &len, false); - if (!decompress_input_section(p, len, view, view_size)) + if (!decompress_input_section(p, len, view, view_size, + size, big_endian, + shdr.get_sh_flags())) this->error(_("could not decompress section %s"), this->section_name(i).c_str()); } @@ -908,7 +871,30 @@ Sized_relobj_file::do_relocate_sections( Output_file* of, Views* pviews) { - unsigned int shnum = this->shnum(); + this->relocate_section_range(symtab, layout, pshdrs, of, pviews, + 1, this->shnum() - 1); +} + +// Relocate section data for the range of sections START_SHNDX through +// END_SHNDX. + +template +void +Sized_relobj_file::relocate_section_range( + const Symbol_table* symtab, + const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews, + unsigned int start_shndx, + unsigned int end_shndx) +{ + gold_assert(start_shndx >= 1); + gold_assert(end_shndx < this->shnum()); + + if (end_shndx < start_shndx) + return; + Sized_target* target = parameters->sized_target(); @@ -920,8 +906,8 @@ Sized_relobj_file::do_relocate_sections( relinfo.layout = layout; relinfo.object = this; - const unsigned char* p = pshdrs + This::shdr_size; - for (unsigned int i = 1; i < shnum; ++i, p += This::shdr_size) + const unsigned char* p = pshdrs + start_shndx * This::shdr_size; + for (unsigned int i = start_shndx; i <= end_shndx; ++i, p += This::shdr_size) { typename This::Shdr shdr(p); @@ -1005,39 +991,54 @@ Sized_relobj_file::do_relocate_sections( if ((data_shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0) this->split_stack_adjust(symtab, pshdrs, sh_type, index, prelocs, reloc_count, view, view_size, - &reloc_map); + &reloc_map, target); } + Relocatable_relocs* rr = NULL; + if (parameters->options().emit_relocs() + || parameters->options().relocatable()) + rr = this->relocatable_relocs(i); + relinfo.rr = rr; + if (!parameters->options().relocatable()) { target->relocate_section(&relinfo, sh_type, prelocs, reloc_count, os, output_offset == invalid_address, view, address, view_size, reloc_map); if (parameters->options().emit_relocs()) - { - 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); - } + target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count, + os, output_offset, + 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); } else - { - 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); - } + target->relocate_relocs(&relinfo, sh_type, prelocs, reloc_count, + os, output_offset, + view, address, view_size, + (*pviews)[i].view, + (*pviews)[i].view_size); } } +// Return the output view for section SHNDX. + +template +unsigned char* +Sized_relobj_file::do_get_output_view( + unsigned int shndx, + section_size_type* plen) const +{ + gold_assert(this->output_views_ != NULL); + gold_assert(shndx < this->output_views_->size()); + const View_size& v = (*this->output_views_)[shndx]; + *plen = v.view_size; + return v.view; +} + // Write the incremental relocs. template @@ -1107,6 +1108,7 @@ Sized_relobj_file::incremental_relocs_write_reltype( { Reloc reloc(prelocs); + // FIXME: Some targets have a non-standard r_info field. typename elfcpp::Elf_types::Elf_WXword r_info = reloc.get_r_info(); const unsigned int r_sym = elfcpp::elf_r_sym(r_info); const unsigned int r_type = elfcpp::elf_r_type(r_info); @@ -1205,20 +1207,21 @@ Sized_relobj_file::split_stack_adjust( size_t reloc_count, unsigned char* view, section_size_type view_size, - Reloc_symbol_changes** reloc_map) + Reloc_symbol_changes** reloc_map, + const Sized_target* target) { if (sh_type == elfcpp::SHT_REL) this->split_stack_adjust_reltype(symtab, pshdrs, shndx, prelocs, reloc_count, view, view_size, - reloc_map); + reloc_map, target); else { gold_assert(sh_type == elfcpp::SHT_RELA); this->split_stack_adjust_reltype(symtab, pshdrs, shndx, prelocs, reloc_count, view, view_size, - reloc_map); + reloc_map, target); } } @@ -1236,7 +1239,8 @@ Sized_relobj_file::split_stack_adjust_reltype( size_t reloc_count, unsigned char* view, section_size_type view_size, - Reloc_symbol_changes** reloc_map) + Reloc_symbol_changes** reloc_map, + const Sized_target* target) { typedef typename Reloc_types::Reloc Reltype; const int reloc_size = Reloc_types::reloc_size; @@ -1248,10 +1252,10 @@ Sized_relobj_file::split_stack_adjust_reltype( const unsigned char* pr = prelocs; for (size_t i = 0; i < reloc_count; ++i, pr += reloc_size) { - Reltype reloc(pr); - - typename elfcpp::Elf_types::Elf_WXword r_info = reloc.get_r_info(); - unsigned int r_sym = elfcpp::elf_r_sym(r_info); + // Some supported targets have a non-standard r_info field. + // If this call is too slow, we can move this routine to + // target-reloc.h and templatize it on Classify_reloc. + unsigned int r_sym = target->get_r_sym(pr); if (r_sym < local_count) continue; @@ -1270,9 +1274,10 @@ Sized_relobj_file::split_stack_adjust_reltype( && gsym->source() == Symbol::FROM_OBJECT && !gsym->object()->uses_split_stack()) { - unsigned int r_type = elfcpp::elf_r_type(reloc.get_r_info()); - if (parameters->target().is_call_to_non_split(gsym, r_type)) + if (parameters->target().is_call_to_non_split(gsym, pr, view, + view_size)) { + Reltype reloc(pr); section_offset_type offset = convert_to_section_size_type(reloc.get_r_offset()); non_split_refs.push_back(offset); @@ -1329,6 +1334,7 @@ Sized_relobj_file::split_stack_adjust_reltype( std::string from; std::string to; parameters->target().calls_non_split(this, shndx, p->first, p->second, + prelocs, reloc_count, view, view_size, &from, &to); if (!from.empty()) { @@ -1342,9 +1348,7 @@ Sized_relobj_file::split_stack_adjust_reltype( { Reltype reloc(pr); - typename elfcpp::Elf_types::Elf_WXword r_info = - reloc.get_r_info(); - unsigned int r_sym = elfcpp::elf_r_sym(r_info); + unsigned int r_sym = target->get_r_sym(pr); if (r_sym < local_count) continue; @@ -1415,13 +1419,21 @@ Sized_relobj_file::find_functions( continue; bool is_ordinary; - unsigned int sym_shndx = this->adjust_sym_shndx(i, isym.get_st_shndx(), - &is_ordinary); - if (!is_ordinary || sym_shndx != shndx) + Symbol_location loc; + loc.shndx = this->adjust_sym_shndx(i, isym.get_st_shndx(), + &is_ordinary); + if (!is_ordinary) + continue; + + loc.object = this; + loc.offset = isym.get_st_value(); + parameters->target().function_location(&loc); + + if (loc.shndx != shndx) continue; section_offset_type value = - convert_to_section_size_type(isym.get_st_value()); + convert_to_section_size_type(loc.offset); section_size_type fnsize = convert_to_section_size_type(isym.get_st_size()); @@ -1556,11 +1568,9 @@ Track_relocs::next_symndx() const { if (this->pos_ >= this->len_) return -1U; - - // Rel and Rela start out the same, so we can use Rel to find the - // symbol index. - elfcpp::Rel rel(this->prelocs_ + this->pos_); - return elfcpp::elf_r_sym(rel.get_r_info()); + Sized_target* target + = parameters->sized_target(); + return target->get_r_sym(this->prelocs_ + this->pos_); } // Return the addend of the next reloc, or 0 if there isn't one. @@ -1729,6 +1739,23 @@ Sized_relobj_file<32, false>::do_relocate_sections( const unsigned char* pshdrs, Output_file* of, Views* pviews); + +template +void +Sized_relobj_file<32, false>::relocate_section_range( + const Symbol_table* symtab, + const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews, + unsigned int start_shndx, + unsigned int end_shndx); + +template +unsigned char* +Sized_relobj_file<32, false>::do_get_output_view( + unsigned int shndx, + section_size_type* plen) const; #endif #ifdef HAVE_TARGET_32_BIG @@ -1740,6 +1767,23 @@ Sized_relobj_file<32, true>::do_relocate_sections( const unsigned char* pshdrs, Output_file* of, Views* pviews); + +template +void +Sized_relobj_file<32, true>::relocate_section_range( + const Symbol_table* symtab, + const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews, + unsigned int start_shndx, + unsigned int end_shndx); + +template +unsigned char* +Sized_relobj_file<32, true>::do_get_output_view( + unsigned int shndx, + section_size_type* plen) const; #endif #ifdef HAVE_TARGET_64_LITTLE @@ -1751,6 +1795,23 @@ Sized_relobj_file<64, false>::do_relocate_sections( const unsigned char* pshdrs, Output_file* of, Views* pviews); + +template +void +Sized_relobj_file<64, false>::relocate_section_range( + const Symbol_table* symtab, + const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews, + unsigned int start_shndx, + unsigned int end_shndx); + +template +unsigned char* +Sized_relobj_file<64, false>::do_get_output_view( + unsigned int shndx, + section_size_type* plen) const; #endif #ifdef HAVE_TARGET_64_BIG @@ -1762,6 +1823,23 @@ Sized_relobj_file<64, true>::do_relocate_sections( const unsigned char* pshdrs, Output_file* of, Views* pviews); + +template +void +Sized_relobj_file<64, true>::relocate_section_range( + const Symbol_table* symtab, + const Layout* layout, + const unsigned char* pshdrs, + Output_file* of, + Views* pviews, + unsigned int start_shndx, + unsigned int end_shndx); + +template +unsigned char* +Sized_relobj_file<64, true>::do_get_output_view( + unsigned int shndx, + section_size_type* plen) const; #endif #ifdef HAVE_TARGET_32_LITTLE