PR ld/15302

	* elf32-arm.c (allocate_dynrelocs_for_symbol): Revert previous patch.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 786d3985b6da3108bbec4683306181a45870d506..49a6fe60b860707c6cbfb02bca044fa075d13498 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-28  Nick Clifton  <nickc@redhat.com>
+
+       PR ld/15302
+       * elf32-arm.c (allocate_dynrelocs_for_symbol): Revert previous patch.
+
 2013-06-27  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Reserve one slot

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index fe01c9a5aca6a635248ace15e918d18e13335463..eef1b1361afcb40499f56ec9d682d6b08e13cf66 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -13340,12 +13340,6 @@ allocate_dynrelocs_for_symbol (struct elf_link_hash_entry *h, void * inf)
       h->root.u.def.value = th->root.u.def.value & ~1;
     }
 
-  /* Make sure we are not applying ST_BRANCH_TO_ARM to symbols
-     for thumb-only targets.  */
-  if (using_thumb_only (htab)
-      && h->target_internal == ST_BRANCH_TO_ARM)
-    h->target_internal = ST_BRANCH_TO_THUMB;
-
   if (eh->dyn_relocs == NULL)
     return TRUE;