From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 1 Aug 1994 20:53:48 +0000 (+0000)
Subject: 	* elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30e5ad97e99fd2a3944ebeec57a0d89d0b06578f;p=binutils-gdb.git

	* elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol
	handling again.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9ced001c190..b3486026cc5 100644
--- 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 6e0f2d0dea9..980e11c28c3 100644
--- 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