From 4610564552cf56d57952b34289f0e253a85e38fc Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 13 Dec 2010 01:06:35 +0000 Subject: * ldlang.c (load_symbols): Correct last change. --- ld/ChangeLog | 4 ++++ ld/ldlang.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index ca9baf8..d41197b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2010-12-13 Alan Modra + + * ldlang.c (load_symbols): Correct last change. + 2010-12-12 H.J. Lu * ldlang.c (load_symbols): Optimize for add_archive_element. diff --git a/ld/ldlang.c b/ld/ldlang.c index 03a11bd..6dc0229 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; -- cgit v1.1