diff options
author | Nick Clifton <nickc@redhat.com> | 2013-06-28 12:22:42 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2013-06-28 12:22:42 +0000 |
commit | 4395b290c3931fe0c39c50547042c072b0892196 (patch) | |
tree | 149b303a3bc6f7fad76b439e40f5d48a6e525baf /bfd | |
parent | 7799ddd9897e0d9ec225842abd04c5ea64e3ee79 (diff) | |
download | binutils-redhat-4395b290c3931fe0c39c50547042c072b0892196.tar.gz |
PR ld/15302
* elf32-arm.c (allocate_dynrelocs_for_symbol): Revert previous patch.
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/ChangeLog | 5 | ||||
-rw-r--r-- | bfd/elf32-arm.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 786d3985b6..49a6fe60b8 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 fe01c9a5ac..eef1b1361a 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; |