aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2013-06-28 12:22:42 +0000
committerNick Clifton <nickc@redhat.com>2013-06-28 12:22:42 +0000
commitc3b6407fbe23dd386b8aee88a45fb3dd718fe2ea (patch)
treef2609157e5ef4ad41e73cd588fd51fb460ec2ba5
parent7f77d948db77f530657b9e3bfe4c59de5ea1f7e9 (diff)
downloadgdb-c3b6407fbe23dd386b8aee88a45fb3dd718fe2ea.zip
gdb-c3b6407fbe23dd386b8aee88a45fb3dd718fe2ea.tar.gz
gdb-c3b6407fbe23dd386b8aee88a45fb3dd718fe2ea.tar.bz2
PR ld/15302
* elf32-arm.c (allocate_dynrelocs_for_symbol): Revert previous patch.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 786d398..49a6fe6 100644
--- 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 fe01c9a..eef1b13 100644
--- 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;