* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition

	regardless of strength of previous definition.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 062d9e4fe0eab7416456f75c012b2271ca3a5c73..ff5c1bc28864dbb292d0d66e5ad575fdbf76ced8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+       * elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
+       regardless of strength of previous definition.
+
 2005-07-26  Alan Modra  <amodra@bigpond.net.au>
 
        * elflink.c (elf_gc_mark_dynamic_ref_symbol): Handle -shared.

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 102b895f0a4aa098b5d79b932f382dd0d26479e0..98fee0ce4b48ad3ba6d4cb72c5a75bcf4fb42315 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1216,7 +1216,7 @@ _bfd_elf_merge_symbol (bfd *abfd,
     }
 
   /* Skip weak definitions of symbols that are already defined.  */
-  if (newdef && olddef && newweak && !oldweak)
+  if (newdef && olddef && newweak)
     *skip = TRUE;
 
   /* If the old symbol is from a dynamic object, and the new symbol is