2005-05-04 H.J. Lu <hongjiu.lu@intel.com>

	* elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
	at the end, if a strong definition has already been seen.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index de82e20c0fcde04ce644ad139bdd32ae834c65c1..2b010e8a864fae0ce373af566b2f8ae63ce3664d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
+       at the end, if a strong definition has already been seen.
+
 2005-05-04  Alan Modra  <amodra@bigpond.net.au>
 
        * section.c (struct bfd_section): Replace link_order_head and

diff --git a/bfd/elflink.c b/bfd/elflink.c
index bc71e98026e25bb3ce94ed245658970d3f5a4adf..370a9b7c531736a1601b023aeb2f523e983cef2e 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1078,13 +1078,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
       || h->root.type == bfd_link_hash_undefined)
     *size_change_ok = TRUE;
 
-  /* Skip weak definitions of symbols that are already defined.  */
-  if (newdef && olddef && newweak && !oldweak)
-    {
-      *skip = TRUE;
-      return TRUE;
-    }
-
   /* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
      symbol, respectively, appears to be a common symbol in a dynamic
      object.  If a symbol appears in an uninitialized section, and is
@@ -1211,6 +1204,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
       *size_change_ok = TRUE;
     }
 
+  /* Skip weak definitions of symbols that are already defined.  */
+  if (newdef && olddef && newweak && !oldweak)
+    *skip = TRUE;
+
   /* If the old symbol is from a dynamic object, and the new symbol is
      a definition which is not from a dynamic object, then the new
      symbol overrides the old symbol.  Symbols from regular files