From: Nick Clifton <nickc@redhat.com>
Date: Mon, 2 Sep 2002 14:46:56 +0000 (+0000)
Subject: Fix PROVIDE
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e369e968e378f3025ec2a98382869b4d70f17fb;p=binutils-gdb.git

Fix PROVIDE
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0fd8e85aece..f097310f5ea 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-02  Nick Clifton  <nickc@redhat.com>
+
+	* ldexp.c (exp_fold_tree): If the first attempt to lookup a
+	PROVIDEd symbol fails, look it up again, but this time with
+	the 'create' flag set.
+
 2002-08-30  Nick Clifton  <nickc@redhat.com>
 
 	* scripttempl/elfd10v.sc (MEMORY): Remove UNIFIED, it is not
diff --git a/ld/ldexp.c b/ld/ldexp.c
index 8e3ea6308e8..6c4937ddaef 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -726,22 +726,20 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
 	      if (tree->type.node_class == etree_assign)
 		create = true;
 	      else
-		create = false;
+		create = false;	      
 	      h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
 					create, false, false);
+	      
+	      if (tree->type.node_class == etree_provide
+		  && (h == NULL
+		      || h->type == bfd_link_hash_undefined
+		      || h->type == bfd_link_hash_common))
+		h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+					  true, false, false);
+
 	      if (h == (struct bfd_link_hash_entry *) NULL)
-		{
-		  if (tree->type.node_class == etree_assign)
-		    einfo (_("%P%F:%s: hash creation failed\n"),
-			   tree->assign.dst);
-		}
-	      else if (tree->type.node_class == etree_provide
-		       && h->type != bfd_link_hash_undefined
-		       && h->type != bfd_link_hash_common)
-		{
-		  /* Do nothing.  The symbol was defined by some
-		     object.  */
-		}
+		einfo (_("%P%F:%s: hash creation failed\n"),
+		       tree->assign.dst);
 	      else
 		{
 		  /* FIXME: Should we worry if the symbol is already