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