From: David S. Miller <davem@redhat.com>
Date: Tue, 2 Mar 2010 01:46:09 +0000 (+0000)
Subject: 	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): When STT_GNU_IFUNC and
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b48ca1d4920a19e29f98f7d9e5c02c9e14ad12c4;p=binutils-gdb.git

	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): When STT_GNU_IFUNC and
	h->def_regular, set h->ref_regular.
	(allocate_dynrelocs): Only force output of STT_GNU_IFUNC plt entries
	and dynamic relocations if h->ref_regular.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f86430202d4..c2128e0993c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-01  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): When STT_GNU_IFUNC and
+	h->def_regular, set h->ref_regular.
+	(allocate_dynrelocs): Only force output of STT_GNU_IFUNC plt entries
+	and dynamic relocations if h->ref_regular.
+
 2010-02-25  Alan Modra  <amodra@gmail.com>
 
 	PR ld/11304
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 1947d1a1e87..2137df088f2 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -1277,7 +1277,10 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
       if (h && h->type == STT_GNU_IFUNC)
 	{
 	  if (h->def_regular)
-	    h->plt.refcount += 1;
+	    {
+	      h->ref_regular = 1;
+	      h->plt.refcount += 1;
+	    }
 	}
 
       /* Compatibility with old R_SPARC_REV32 reloc conflicting
@@ -2022,7 +2025,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
   if ((htab->elf.dynamic_sections_created
        && h->plt.refcount > 0)
       || (h->type == STT_GNU_IFUNC
-	  && h->def_regular))
+	  && h->def_regular
+	  && h->ref_regular))
     {
       /* Make sure this symbol is output as a dynamic symbol.
 	 Undefined weak syms won't yet be marked as dynamic.  */
@@ -2034,7 +2038,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
 	}
 
       if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h)
-	  || h->type == STT_GNU_IFUNC)
+	  || (h->type == STT_GNU_IFUNC
+	      && h->def_regular))
 	{
 	  asection *s = htab->elf.splt;