From: amodra <amodra>
Date: Mon, 13 Dec 2010 01:06:34 +0000 (+0000)
Subject: 	* ldlang.c (load_symbols): Correct last change.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=010c0b3b56643a0ecb7bdcd1294e249395f9673d;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* ldlang.c (load_symbols): Correct last change.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ca9baf8308..d41197b338 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-13  Alan Modra  <amodra@gmail.com>
+
+	* ldlang.c (load_symbols): Correct last change.
+
 2010-12-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ldlang.c (load_symbols): Optimize for add_archive_element.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 03a11bd826..6dc022989f 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2718,13 +2718,14 @@ load_symbols (lang_input_statement_type *entry,
 		}
 
 	      subsbfd = member;
-	      if (! ((*link_info.callbacks->add_archive_element)
-		     (&link_info, member, "--whole-archive", &subsbfd)))
+	      if (!(*link_info.callbacks
+		    ->add_archive_element) (&link_info, member,
+					    "--whole-archive", &subsbfd))
 		abort ();
 
 	      /* Potentially, the add_archive_element hook may have set a
 		 substitute BFD for us.  */
-	      if (! bfd_link_add_symbols (member, &link_info))
+	      if (!bfd_link_add_symbols (subsbfd, &link_info))
 		{
 		  einfo (_("%F%B: could not read symbols: %E\n"), member);
 		  loaded = FALSE;