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

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ca9baf83084f8d9a850e834b589125fe5f0e6c0b..d41197b33850aaba829959a51465d60116fd3617 100644 (file)
--- 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 03a11bd82694961da5948f226485386ead595360..6dc022989fd3c3d7ef1039f61ab0c7d43232e587 100644 (file)
--- 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;