darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via

Browse source 
stubs as resolved.
This commit is contained in:
Nick Clifton 2011-10-13 09:47:51 +00:00
parent e103e98648
commit 9cd3e4e527
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-13 Richard Sandiford <richard.sandiford@linaro.org>
* elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via
stubs as resolved.
2011-10-11 Alan Modra <amodra@gmail.com>
PR binutils/13278

25
bfd/elf32-arm.c
View file

@ -8220,15 +8220,19 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
{
/* The target is out of reach, so redirect the
branch to the local stub for this function. */
stub_entry = elf32_arm_get_stub_entry (input_section,
sym_sec, h,
rel, globals,
stub_type);
if (stub_entry != NULL)
value = (stub_entry->stub_offset
+ stub_entry->stub_sec->output_offset
+ stub_entry->stub_sec->output_section->vma);
{
if (stub_entry != NULL)
value = (stub_entry->stub_offset
+ stub_entry->stub_sec->output_offset
+ stub_entry->stub_sec->output_section->vma);
if (plt_offset != (bfd_vma) -1)
*unresolved_reloc_p = FALSE;
}
}
else
{
@ -8653,9 +8657,14 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
rel, globals,
stub_type);
if (stub_entry != NULL)
value = (stub_entry->stub_offset
+ stub_entry->stub_sec->output_offset
+ stub_entry->stub_sec->output_section->vma);
{
value = (stub_entry->stub_offset
+ stub_entry->stub_sec->output_offset
+ stub_entry->stub_sec->output_section->vma);
if (plt_offset != (bfd_vma) -1)
*unresolved_reloc_p = FALSE;
}
/* If this call becomes a call to Arm, force BLX. */
if (globals->use_blx && (r_type == R_ARM_THM_CALL))