From: amodra <amodra>
Date: Thu, 2 Jun 2005 13:13:51 +0000 (+0000)
Subject: 	* elf64-ppc.c (add_symbol_adjust): Set sym visibility to most
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d49a68dc8e0ff722b4407c8139a070e5a496f852;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* elf64-ppc.c (add_symbol_adjust): Set sym visibility to most
	restrictive of func code and func descr for undefined syms as well
	as defined.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cc4031e13a..a37d99c407 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (add_symbol_adjust): Set sym visibility to most
+	restrictive of func code and func descr for undefined syms as well
+	as defined.
+
 2005-05-31  Jim Blandy  <jimb@redhat.com>
 
 	* Makefile.am: Regenerate dependencies with 'make dep-am'.
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 9052a233ea..04fcdc9166 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -4159,9 +4159,7 @@ add_symbol_adjust (struct elf_link_hash_entry *h, void *inf)
       else
 	fdh->elf.ref_regular = 1;
     }
-  else if (fdh != NULL
-	   && (fdh->elf.root.type == bfd_link_hash_defined
-	       || fdh->elf.root.type == bfd_link_hash_defweak))
+  else if (fdh != NULL)
     {
       unsigned entry_vis = ELF_ST_VISIBILITY (eh->elf.other) - 1;
       unsigned descr_vis = ELF_ST_VISIBILITY (fdh->elf.other) - 1;
@@ -4170,7 +4168,9 @@ add_symbol_adjust (struct elf_link_hash_entry *h, void *inf)
       else if (entry_vis > descr_vis)
 	eh->elf.other += descr_vis - entry_vis;
 
-      if (eh->elf.root.type == bfd_link_hash_undefined)
+      if ((fdh->elf.root.type == bfd_link_hash_defined
+	   || fdh->elf.root.type == bfd_link_hash_defweak)
+	  && eh->elf.root.type == bfd_link_hash_undefined)
 	{
 	  eh->elf.root.type = bfd_link_hash_undefweak;
 	  eh->was_undefined = 1;