OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR ld/11375

Browse Source 
* elf64-ppc.c (ppc64_elf_relocate_section): Always look up a
	possible stub on branches.
This commit is contained in:
Alan Modra 2010-03-26 00:35:57 +00:00
parent 93620fdb76
commit 6abec6bce3
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2010-03-26 Alan Modra <amodra@gmail.com>
PR ld/11375
* elf64-ppc.c (ppc64_elf_relocate_section): Always look up a
possible stub on branches.
2010-03-25 Joseph Myers <joseph@codesourcery.com>
* Makefile.am (ALL_MACHINES): Add cpu-tic6x.lo.

34
bfd/elf64-ppc.c
View File

@ -11914,23 +11914,13 @@ ppc64_elf_relocate_section (bfd *output_bfd,
linkage stubs needs to be followed by a nop, as the nop
will be replaced with an instruction to restore the TOC
base pointer. */
stub_entry = NULL;
fdh = h;
if (h != NULL
&& h->oh != NULL
&& h->oh->is_func_descriptor)
fdh = ppc_follow_link (h->oh);
if (((fdh != NULL
&& fdh->elf.plt.plist != NULL)
|| (sec != NULL
&& sec->output_section != NULL
&& sec->id <= htab->top_id
&& (htab->stub_group[sec->id].toc_off
!= htab->stub_group[input_section->id].toc_off))
|| (h == NULL
&& ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC))
&& (stub_entry = ppc_get_stub_entry (input_section, sec, fdh,
rel, htab)) != NULL
stub_entry = ppc_get_stub_entry (input_section, sec, fdh, rel, htab);
if (stub_entry != NULL
&& (stub_entry->stub_type == ppc_stub_plt_call
|| stub_entry->stub_type == ppc_stub_plt_branch_r2off
|| stub_entry->stub_type == ppc_stub_long_branch_r2off))
@ -12015,7 +12005,9 @@ ppc64_elf_relocate_section (bfd *output_bfd,
unresolved_reloc = FALSE;
}
if (stub_entry == NULL
if ((stub_entry == NULL
|| stub_entry->stub_type == ppc_stub_long_branch
|| stub_entry->stub_type == ppc_stub_plt_branch)
&& get_opd_info (sec) != NULL)
{
/* The branch destination is the value of the opd entry. */
@ -12036,13 +12028,15 @@ ppc64_elf_relocate_section (bfd *output_bfd,
+ input_section->output_offset
+ input_section->output_section->vma);
if (stub_entry == NULL
&& (relocation + addend - from + max_br_offset
>= 2 * max_br_offset)
&& r_type != R_PPC64_ADDR14_BRTAKEN
&& r_type != R_PPC64_ADDR14_BRNTAKEN)
stub_entry = ppc_get_stub_entry (input_section, sec, fdh, rel,
htab);
if (stub_entry != NULL
&& (stub_entry->stub_type == ppc_stub_long_branch
|| stub_entry->stub_type == ppc_stub_plt_branch)
&& (r_type == R_PPC64_ADDR14_BRTAKEN
|| r_type == R_PPC64_ADDR14_BRNTAKEN
|| (relocation + addend - from + max_br_offset
< 2 * max_br_offset)))
/* Don't use the stub if this branch is in range. */
stub_entry = NULL;
if (stub_entry != NULL)
{