Backport of:

bfd:
2008-11-24  Joseph Myers  <joseph@codesourcery.com>

	* elf32-arm.c (elf32_arm_final_link_relocate): Do not turn
	branches to undefine weak symbols into branches to the next
	instruction if creating PLT entries for those symbols.

ld/testsuite:
2008-11-24  Joseph Myers  <joseph@codesourcery.com>

	* ld-arm/thumb2-bl-undefweak.d, ld-arm/thumb2-bl-undefweak.s: New.
	* ld-arm/arm-elf.exp: Run thumb2-bl-undefweak test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 51362e3efa0eb180e8ec069e1de9d444d6c3fc06..e137b000b674e5735e40c674d64c7cc19623df55 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-14  Joseph Myers  <joseph@codesourcery.com>
+
+       * elf32-arm.c (elf32_arm_final_link_relocate): Do not turn
+       branches to undefine weak symbols into branches to the next
+       instruction if creating PLT entries for those symbols.
+
 2008-12-23  Nick Clifton  <nickc@redhat.com>
 
        * Import this patch from the mainline:

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index da1ac24d34aba49cd088c1d4a62f5ea32faa917b..8ce028e6be4196347e626de3eba6663abcfcb4fa 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -6381,8 +6381,9 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
        int thumb2 = using_thumb2 (globals);
 
        /* A branch to an undefined weak symbol is turned into a jump to
-          the next instruction.  */
-       if (h && h->root.type == bfd_link_hash_undefweak)
+          the next instruction unless a PLT entry will be created.  */
+       if (h && h->root.type == bfd_link_hash_undefweak
+           && !(splt != NULL && h->plt.offset != (bfd_vma) -1))
          {
            bfd_put_16 (input_bfd, 0xe000, hit_data);
            bfd_put_16 (input_bfd, 0xbf00, hit_data + 2);

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6ca9266fadaa11d6c39b42e3413d0d2999c130f1..f67cfbd0556f474ae005ba10937287bb25cc8134 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-14  Joseph Myers  <joseph@codesourcery.com>
+
+       * ld-arm/thumb2-bl-undefweak.d, ld-arm/thumb2-bl-undefweak.s: New.
+       * ld-arm/arm-elf.exp: Run thumb2-bl-undefweak test.
+
 2008-09-30  Alan Modra  <amodra@bigpond.net.au>
 
        * ld-elf/extract-symbol-1sec.d: Correct section lma.

diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 6075e68d35717a0f5717d20a2bf93f5c8526a842..665dab19d4a52838c6d465d6f6f63d1ccda3d4b6 100644 (file)
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -184,6 +184,7 @@ run_dump_test "group-relocs-alu-bad"
 run_dump_test "group-relocs-ldr-bad"
 run_dump_test "group-relocs-ldrs-bad"
 run_dump_test "group-relocs-ldc-bad"
+run_dump_test "thumb2-bl-undefweak"
 run_dump_test "emit-relocs1"
 
 # Exclude non-ARM-EABI targets.