aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-i386.c7
-rw-r--r--bfd/elf64-x86-64.c7
3 files changed, 10 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f4acda0..0bf7665 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf32-i386.c (elf_i386_allocate_dynrelocs): Revert the last
+ change.
+ * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+
2014-01-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/16428
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index e834a5a..4d391e1 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2390,12 +2390,9 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
}
/* Also discard relocs on undefined weak syms with non-default
- visibility. Don't discard relocs against __ehdr_start which
- will be defined by assign_file_positions_for_non_load_sections
- later. */
+ visibility. */
if (eh->dyn_relocs != NULL
- && h->root.type == bfd_link_hash_undefweak
- && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ && h->root.type == bfd_link_hash_undefweak)
{
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
eh->dyn_relocs = NULL;
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index f364fe4..edee8ec 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2473,12 +2473,9 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
}
/* Also discard relocs on undefined weak syms with non-default
- visibility. Don't discard relocs against __ehdr_start which
- will be defined by assign_file_positions_for_non_load_sections
- later. */
+ visibility. */
if (eh->dyn_relocs != NULL
- && h->root.type == bfd_link_hash_undefweak
- && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ && h->root.type == bfd_link_hash_undefweak)
{
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
eh->dyn_relocs = NULL;