Don't discard relocs against __ehdr_start

__ehdr_start will be defined by assign_file_positions_for_non_load_sections
later.

	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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7d13a35271aa9324ef698ab042671c02ddc98c0d..f4acda0ad2e7f1cfe1160c61e4299013c74ec965 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 4d391e13c7d7fa504fc3b996582efd1f6bcbc993..e834a5a1152474326e4680e0be7c595be9afa872 100644 (file)
--- 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 edee8ecefd50e98d87d58746e5f9a9509fadfc64..f364fe43dceeeefa9afd804f9e51028ee6870d0b 100644 (file)
--- 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;