From: H.J. Lu <hjl.tools@gmail.com>
Date: Sat, 14 Oct 2017 18:03:26 +0000 (-0700)
Subject: microblaze: Check UNDEFWEAK_NO_DYNAMIC_RELOC
X-Git-Tag: users/ARM/embedded-binutils-master-2017q4~588
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=112fef4084ff0bdd6dd9aacca85f5fe62e1a5423;p=platform%2Fupstream%2Fbinutils.git

microblaze: Check UNDEFWEAK_NO_DYNAMIC_RELOC

Don't generate dynamic relocation against weak undefined symbol if it
is resolved to zero.  FIXME: UNDEFWEAK_NO_DYNAMIC_RELOC may need to be
checked in more places.

	PR ld/22269
	* elf32-microblaze.c (microblaze_elf_relocate_section): Don't
	generate dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is
	true.
	(allocate_dynrelocs): Discard dynamic relocations if
	UNDEFWEAK_NO_DYNAMIC_RELOC is true.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 90a85a7..44ce307 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,15 @@
 2017-10-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/22269
+	* elf32-microblaze.c (microblaze_elf_relocate_section): Don't
+	generate dynamic relocation if UNDEFWEAK_NO_DYNAMIC_RELOC is
+	true.
+	(allocate_dynrelocs): Discard dynamic relocations if
+	UNDEFWEAK_NO_DYNAMIC_RELOC is true.
+
+2017-10-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/22269
 	* elf32-m68k.c (elf_m68k_check_relocs): Don't allocate dynamic
 	relocations if UNDEFWEAK_NO_DYNAMIC_RELOC is true.
 	(elf_m68k_adjust_dynamic_symbol): Don't make symbol dynamic if
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index 94ef09e..494b636 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -1002,6 +1002,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
       else
 	{
 	  bfd_vma relocation;
+	  bfd_boolean resolved_to_zero;
 
 	  /* This is a final link.  */
 	  sym = NULL;
@@ -1041,6 +1042,9 @@ microblaze_elf_relocate_section (bfd *output_bfd,
 	      goto check_reloc;
 	    }
 
+	  resolved_to_zero = (h != NULL
+			      && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
+
 	  switch ((int) r_type)
 	    {
 	    case (int) R_MICROBLAZE_SRO32 :
@@ -1257,7 +1261,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
 		/* Need to generate relocs ? */
 		if ((bfd_link_pic (info) || indx != 0)
 		    && (h == NULL
-		    || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		    || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			&& !resolved_to_zero)
 		    || h->root.type != bfd_link_hash_undefweak))
 		  need_relocs = TRUE;
 
@@ -1432,7 +1437,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
 
 		if ((bfd_link_pic (info)
 		     && (h == NULL
-			 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			     && !resolved_to_zero)
 			 || h->root.type != bfd_link_hash_undefweak)
 		     && (!howto->pc_relative
 			 || (h != NULL
@@ -2861,6 +2867,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
 		pp = &p->next;
 	    }
 	}
+      else if (UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
+	eh->dyn_relocs = NULL;
     }
   else
     {