From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 15 Jan 2014 00:42:35 +0000 (-0800)
Subject: Don't discard relocs against __ehdr_start
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=818d220a6fe3d0512a226188e9164245a02c9185;p=binutils-gdb.git

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 7d13a35271a..f4acda0ad2e 100644
--- 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 4d391e13c7d..e834a5a1152 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 edee8ecefd5..f364fe43dce 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;