* elflink.h (elf_merge_symbol): Don't check the hash creator until

	after we have set *sym_hash.

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 3898116a6455e809521dbc4007ce6620401f0fca..974d8f06c12cdcaf127391f4db22e95df73a5e7f 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -298,11 +298,6 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
   bfd *oldbfd;
   boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
 
-  /* This code is for coping with dynamic objects, and is only useful
-     if we are doing an ELF link.  */
-  if (info->hash->creator != abfd->xvec)
-    return true;
-
   *override = false;
   *type_change_ok = false;
   *size_change_ok = false;
@@ -319,6 +314,11 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
     return false;
   *sym_hash = h;
 
+  /* This code is for coping with dynamic objects, and is only useful
+     if we are doing an ELF link.  */
+  if (info->hash->creator != abfd->xvec)
+    return true;
+
   /* For merging, we only care about real symbols.  */
 
   while (h->root.type == bfd_link_hash_indirect