From 589342bc49be60680807fa478fc220591fb06942 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 13 Oct 2011 09:47:50 +0000 Subject: [PATCH] * elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via stubs as resolved. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.c | 25 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e81f23985..42ef646d4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2011-10-13 Richard Sandiford + + * elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via + stubs as resolved. + 2011-10-11 Alan Modra PR binutils/13278 diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 02d667f44..bcf0aac31 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -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)) -- 2.11.4.GIT