aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/linker.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ecab270..99c7062 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2016-12-23 Alan Modra <amodra@gmail.com>
+ * linker.c (generic_link_check_archive_element): Call target
+ bfd_link_add_symbols to add element symbols.
+
+2016-12-23 Alan Modra <amodra@gmail.com>
+
* linker.c (generic_link_add_symbols): Delete. Merge into..
(_bfd_generic_link_add_symbols): ..here.
(generic_link_check_archive_element_no_collect): Delete.
diff --git a/bfd/linker.c b/bfd/linker.c
index 9763b84..3bee361 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -1064,7 +1064,7 @@ generic_link_check_archive_element (bfd *abfd,
return FALSE;
/* Potentially, the add_archive_element hook may have set a
substitute BFD for us. */
- return generic_link_add_object_symbols (abfd, info);
+ return bfd_link_add_symbols (abfd, info);
}
/* P is a common symbol. */