* elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol

	handling again.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9ced001c190e9c53f85ee3f9e8518b46b9c82fa8..b3486026cc560452809cf56d68a1cda756d0adad 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug  1 12:04:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
+       * elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol
+       handling again.
+
        * elfcode.h (elf_slurp_reloc_table): Don't try to read the relocs
        if there aren't any.
 

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 6e0f2d0dea978b4734f60f6346439f7181d36c5d..980e11c28c35ec25f5fc3322fe958b2cd6839ed2 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -5035,12 +5035,11 @@ elf_adjust_dynamic_symbol (h, data)
       weakdef = h->weakdef;
       BFD_ASSERT (weakdef->root.type == bfd_link_hash_defined);
       BFD_ASSERT (weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC);
-      if ((weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-         || (weakdef->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) != 0)
+      if ((weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
        {
-         /* This symbol is defined or referenced by a regular object
-            file, so we will not do anything special.  Clear weakdef
-            for the convenience of the processor backend.  */
+         /* This symbol is defined by a regular object file, so we
+            will not do anything special.  Clear weakdef for the
+            convenience of the processor backend.  */
          h->weakdef = NULL;
        }
       else