MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[GOLD] internal error in relocate, at powerpc.cc:10473

Browse Source 
GOT relocations can refer directly to a function in a fixed position
executable, unlike ADDR64 which needs a global entry stub, or branch
relocs, which need PLT stubs.

	* powerpc.cc (is_got_reloc): New function.
	(Target_powerpc::Relocate::relocate): Use it here, exclude GOT
	relocs when looking for stubs.
This commit is contained in:
Alan Modra 2020-10-09 10:59:33 +10:30
parent 32930e4edb
commit 4290b0ab2b
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
2020-10-09 Alan Modra <amodra@gmail.com>
* powerpc.cc (is_got_reloc): New function.
(Target_powerpc::Relocate::relocate): Use it here, exclude GOT
relocs when looking for stubs.
2020-10-08 H.J. Lu <hongjiu.lu@intel.com> 2020-10-08 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/split_i386.sh: Updated for --split-stack-adjust-size * testsuite/split_i386.sh: Updated for --split-stack-adjust-size

22
gold/powerpc.cc
View File

@ -1884,6 +1884,19 @@ is_plt16_reloc(unsigned int r_type)
|| (size == 64 && r_type == elfcpp::R_PPC64_PLT16_LO_DS)); || (size == 64 && r_type == elfcpp::R_PPC64_PLT16_LO_DS));
} }
// GOT_TYPE_STANDARD (ie. not TLS) GOT relocs
inline bool
is_got_reloc(unsigned int r_type)
{
return (r_type == elfcpp::R_POWERPC_GOT16
|| r_type == elfcpp::R_POWERPC_GOT16_LO
|| r_type == elfcpp::R_POWERPC_GOT16_HI
|| r_type == elfcpp::R_POWERPC_GOT16_HA
|| r_type == elfcpp::R_PPC64_GOT16_DS
|| r_type == elfcpp::R_PPC64_GOT16_LO_DS
|| r_type == elfcpp::R_PPC64_GOT_PCREL34);
}
// If INSN is an opcode that may be used with an @tls operand, return // If INSN is an opcode that may be used with an @tls operand, return
// the transformed insn for TLS optimisation, otherwise return 0. If // the transformed insn for TLS optimisation, otherwise return 0. If
// REG is non-zero only match an insn with RB or RA equal to REG. // REG is non-zero only match an insn with RB or RA equal to REG.
@ -10381,6 +10394,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
? gsym->use_plt_offset(Scan::get_reference_flags(r_type, target)) ? gsym->use_plt_offset(Scan::get_reference_flags(r_type, target))
: object->local_has_plt_offset(r_sym)); : object->local_has_plt_offset(r_sym));
if (has_plt_offset if (has_plt_offset
&& !is_got_reloc(r_type)
&& !is_plt16_reloc<size>(r_type) && !is_plt16_reloc<size>(r_type)
&& r_type != elfcpp::R_PPC64_PLT_PCREL34 && r_type != elfcpp::R_PPC64_PLT_PCREL34
&& r_type != elfcpp::R_PPC64_PLT_PCREL34_NOTOC && r_type != elfcpp::R_PPC64_PLT_PCREL34_NOTOC
@ -10523,13 +10537,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
elfcpp::Swap<32, big_endian>::writeval(iview + 1, pnop & 0xffffffff); elfcpp::Swap<32, big_endian>::writeval(iview + 1, pnop & 0xffffffff);
r_type = elfcpp::R_POWERPC_NONE; r_type = elfcpp::R_POWERPC_NONE;
} }
else if (r_type == elfcpp::R_POWERPC_GOT16 else if (is_got_reloc(r_type))
|| r_type == elfcpp::R_POWERPC_GOT16_LO
|| r_type == elfcpp::R_POWERPC_GOT16_HI
|| r_type == elfcpp::R_POWERPC_GOT16_HA
|| r_type == elfcpp::R_PPC64_GOT16_DS
|| r_type == elfcpp::R_PPC64_GOT16_LO_DS
|| r_type == elfcpp::R_PPC64_GOT_PCREL34)
{ {
if (gsym != NULL) if (gsym != NULL)
{ {