espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 14:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[GOLD] powerpc.cc tidies

Browse Source 
Plus some paranoia in symval_for_branch.  We shouldn't get there with
dynamic symbols, but if we ever did the static_cast to Powerpc_relobj
would be wrong.

	* powerpc.cc: Use shorter equivalent elfcpp typedef for
	Reltype and reloc_size throughout.
	(Target_powerpc::symval_for_branch): Exclude dynamic symbols.
	(Target_powerpc::Scan::local): Use local var r_sym.
	(Target_powerpc::Scan::global: Likewise.
	(Target_powerpc::Relocate::relocate): Delete shadowing r_sym.
This commit is contained in:
Alan Modra
2017-01-06 15:47:33 +10:30
parent a6eb589ffe
commit 0e123f69da
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gold/ChangeLog
View File

@ -1,3 +1,12 @@
2017-01-07 Alan Modra <amodra@gmail.com>
* powerpc.cc: Use shorter equivalent elfcpp typedef for
Reltype and reloc_size throughout.
(Target_powerpc::symval_for_branch): Exclude dynamic symbols.
(Target_powerpc::Scan::local): Use local var r_sym.
(Target_powerpc::Scan::global: Likewise.
(Target_powerpc::Relocate::relocate): Delete shadowing r_sym.
2017-01-02 Alan Modra <amodra@gmail.com> 2017-01-02 Alan Modra <amodra@gmail.com>
Update year range in copyright notice of all files. Update year range in copyright notice of all files.

66
gold/powerpc.cc
View File

@ -1816,10 +1816,8 @@ Powerpc_relobj<size, big_endian>::scan_opd_relocs(
{ {
if (size == 64) if (size == 64)
{ {
typedef typename Reloc_types<elfcpp::SHT_RELA, size, big_endian>::Reloc typedef typename elfcpp::Rela<size, big_endian> Reltype;
Reltype; const int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
const int reloc_size
= Reloc_types<elfcpp::SHT_RELA, size, big_endian>::reloc_size;
const int sym_size = elfcpp::Elf_sizes<size>::sym_size; const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
Address expected_off = 0; Address expected_off = 0;
bool regular = true; bool regular = true;
@ -3493,8 +3491,7 @@ class Output_data_brlt_powerpc : public Output_section_data_build
os->set_section_offsets_need_adjustment(); os->set_section_offsets_need_adjustment();
if (this->rel_ != NULL) if (this->rel_ != NULL)
{ {
unsigned int reloc_size const unsigned int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
= Reloc_types<elfcpp::SHT_RELA, size, big_endian>::reloc_size;
this->rel_->reset_address_and_file_offset(); this->rel_->reset_address_and_file_offset();
this->rel_->set_current_data_size(num_branches * reloc_size); this->rel_->set_current_data_size(num_branches * reloc_size);
this->rel_->finalize_data_size(); this->rel_->finalize_data_size();
@ -5780,9 +5777,11 @@ Target_powerpc<size, big_endian>::Scan::local(
case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRTAKEN:
case elfcpp::R_POWERPC_REL14_BRNTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN:
if (!is_ifunc) if (!is_ifunc)
target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), {
r_type, elfcpp::elf_r_sym<size>(reloc.get_r_info()), unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
reloc.get_r_addend()); target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(),
r_type, r_sym, reloc.get_r_addend());
}
break; break;
case elfcpp::R_PPC64_REL64: case elfcpp::R_PPC64_REL64:
@ -6043,9 +6042,9 @@ Target_powerpc<size, big_endian>::Scan::global(
bool pushed_ifunc = false; bool pushed_ifunc = false;
if (is_ifunc && this->reloc_needs_plt_for_ifunc(target, object, r_type, true)) if (is_ifunc && this->reloc_needs_plt_for_ifunc(target, object, r_type, true))
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(),
r_type, elfcpp::elf_r_sym<size>(reloc.get_r_info()), r_type, r_sym, reloc.get_r_addend());
reloc.get_r_addend());
target->make_plt_entry(symtab, layout, gsym); target->make_plt_entry(symtab, layout, gsym);
pushed_ifunc = true; pushed_ifunc = true;
} }
@ -6135,9 +6134,9 @@ Target_powerpc<size, big_endian>::Scan::global(
} }
if (!is_ifunc || (!pushed_ifunc && need_ifunc_plt)) if (!is_ifunc || (!pushed_ifunc && need_ifunc_plt))
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
target->push_branch(ppc_object, data_shndx, target->push_branch(ppc_object, data_shndx,
reloc.get_r_offset(), r_type, reloc.get_r_offset(), r_type, r_sym,
elfcpp::elf_r_sym<size>(reloc.get_r_info()),
reloc.get_r_addend()); reloc.get_r_addend());
target->make_plt_entry(symtab, layout, gsym); target->make_plt_entry(symtab, layout, gsym);
} }
@ -6192,10 +6191,9 @@ Target_powerpc<size, big_endian>::Scan::global(
case elfcpp::R_POWERPC_REL24: case elfcpp::R_POWERPC_REL24:
if (!is_ifunc) if (!is_ifunc)
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(),
r_type, r_type, r_sym, reloc.get_r_addend());
elfcpp::elf_r_sym<size>(reloc.get_r_info()),
reloc.get_r_addend());
if (gsym->needs_plt_entry() if (gsym->needs_plt_entry()
|| (!gsym->final_value_is_known() || (!gsym->final_value_is_known()
&& (gsym->is_undefined() && (gsym->is_undefined()
@ -6233,9 +6231,11 @@ Target_powerpc<size, big_endian>::Scan::global(
case elfcpp::R_POWERPC_REL14_BRTAKEN: case elfcpp::R_POWERPC_REL14_BRTAKEN:
case elfcpp::R_POWERPC_REL14_BRNTAKEN: case elfcpp::R_POWERPC_REL14_BRNTAKEN:
if (!is_ifunc) if (!is_ifunc)
target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(), {
r_type, elfcpp::elf_r_sym<size>(reloc.get_r_info()), unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
reloc.get_r_addend()); target->push_branch(ppc_object, data_shndx, reloc.get_r_offset(),
r_type, r_sym, reloc.get_r_addend());
}
break; break;
case elfcpp::R_POWERPC_REL16: case elfcpp::R_POWERPC_REL16:
@ -7036,7 +7036,8 @@ Target_powerpc<size, big_endian>::symval_for_branch(
// descriptor, use the function descriptor code entry address // descriptor, use the function descriptor code entry address
Powerpc_relobj<size, big_endian>* symobj = object; Powerpc_relobj<size, big_endian>* symobj = object;
if (gsym != NULL if (gsym != NULL
&& gsym->source() != Symbol::FROM_OBJECT) && (gsym->source() != Symbol::FROM_OBJECT
|| gsym->object()->is_dynamic()))
return true; return true;
if (gsym != NULL) if (gsym != NULL)
symobj = static_cast<Powerpc_relobj<size, big_endian>*>(gsym->object()); symobj = static_cast<Powerpc_relobj<size, big_endian>*>(gsym->object());
@ -7107,8 +7108,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
typedef Powerpc_relocate_functions<size, big_endian> Reloc; typedef Powerpc_relocate_functions<size, big_endian> Reloc;
typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn; typedef typename elfcpp::Swap<32, big_endian>::Valtype Insn;
typedef typename Reloc_types<elfcpp::SHT_RELA, typedef typename elfcpp::Rela<size, big_endian> Reltype;
size, big_endian>::Reloc Reltype;
// Offset from start of insn to d-field reloc. // Offset from start of insn to d-field reloc.
const int d_offset = big_endian ? 2 : 0; const int d_offset = big_endian ? 2 : 0;
@ -7182,7 +7182,6 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
} }
else else
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD)); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
value = object->local_got_offset(r_sym, GOT_TYPE_STANDARD); value = object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
} }
@ -7284,7 +7283,6 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
} }
else else
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
gold_assert(object->local_has_got_offset(r_sym, got_type)); gold_assert(object->local_has_got_offset(r_sym, got_type));
value = object->local_got_offset(r_sym, got_type); value = object->local_got_offset(r_sym, got_type);
} }
@ -7384,7 +7382,6 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
} }
else else
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_DTPREL)); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_DTPREL));
value = object->local_got_offset(r_sym, GOT_TYPE_DTPREL); value = object->local_got_offset(r_sym, GOT_TYPE_DTPREL);
} }
@ -7407,7 +7404,6 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
} }
else else
{ {
unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_TPREL)); gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_TPREL));
value = object->local_got_offset(r_sym, GOT_TYPE_TPREL); value = object->local_got_offset(r_sym, GOT_TYPE_TPREL);
} }
@ -7806,8 +7802,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
&& gsym != NULL && gsym != NULL
&& strcmp(gsym->name(), ".TOC.") == 0) && strcmp(gsym->name(), ".TOC.") == 0)
{ {
const int reloc_size const int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
= Reloc_types<elfcpp::SHT_RELA, size, big_endian>::reloc_size;
Reltype prev_rela(preloc - reloc_size); Reltype prev_rela(preloc - reloc_size);
if ((prev_rela.get_r_info() if ((prev_rela.get_r_info()
== elfcpp::elf_r_info<size>(r_sym, == elfcpp::elf_r_info<size>(r_sym,
@ -8289,10 +8284,8 @@ template<int size, bool big_endian>
class Powerpc_scan_relocatable_reloc class Powerpc_scan_relocatable_reloc
{ {
public: public:
typedef typename Reloc_types<elfcpp::SHT_RELA, size, big_endian>::Reloc typedef typename elfcpp::Rela<size, big_endian> Reltype;
Reltype; static const int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
static const int reloc_size =
Reloc_types<elfcpp::SHT_RELA, size, big_endian>::reloc_size;
static const int sh_type = elfcpp::SHT_RELA; static const int sh_type = elfcpp::SHT_RELA;
// Return the symbol referred to by the relocation. // Return the symbol referred to by the relocation.
@ -8432,12 +8425,9 @@ Target_powerpc<size, big_endian>::relocate_relocs(
{ {
gold_assert(sh_type == elfcpp::SHT_RELA); gold_assert(sh_type == elfcpp::SHT_RELA);
typedef typename Reloc_types<elfcpp::SHT_RELA, size, big_endian>::Reloc typedef typename elfcpp::Rela<size, big_endian> Reltype;
Reltype; typedef typename elfcpp::Rela_write<size, big_endian> Reltype_write;
typedef typename Reloc_types<elfcpp::SHT_RELA, size, big_endian>::Reloc_write const int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
Reltype_write;
const int reloc_size
= Reloc_types<elfcpp::SHT_RELA, size, big_endian>::reloc_size;
// Offset from start of insn to d-field reloc. // Offset from start of insn to d-field reloc.
const int d_offset = big_endian ? 2 : 0; const int d_offset = big_endian ? 2 : 0;