diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2010-12-13 01:06:13 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2010-12-13 01:06:13 +0000 |
| commit | be86fae7b04f61d5b199dedb33d40fed393166e7 (patch) | |
| tree | c63922d402d05d1fa38f28cebe5d7314937dd481 /bfd/vms-alpha.c | |
| parent | 261e94744c337934d4026061c43510791936c6b4 (diff) | |
| download | binutils-redhat-be86fae7b04f61d5b199dedb33d40fed393166e7.tar.gz | |
* aoutx.h (aout_link_check_ar_symbols): Formatting.
* cofflink.c (coff_link_check_ar_symbols): Likewise.
* elflink.c (elf_link_add_archive_symbols): Likewise.
* pdp11.c (aout_link_check_ar_symbols): Likewise.
* xcofflink.c (xcoff_link_check_dynamic_ar_symbols,
xcoff_link_check_dynamic_ar_symbols): Likewise.
* aoutx.h (aout_link_check_archive_element): Simplify code dealing
with add_archive_element substitute BFD.
* cofflink.c (coff_link_check_archive_element): Likewise.
* ecoff.c (ecoff_link_check_archive_element): Likewise.
(ecoff_link_add_archive_symbols): Likewise.
* linker.c (generic_link_check_archive_element): Likewise.
* pdp11.c (aout_link_check_archive_element): Likewise.
* vms-alpha.c (alpha_vms_link_add_archive_symbols): Likewise.
* xcofflink.c (xcoff_link_check_archive_element): Likewise.
* aoutx.h (aout_link_check_archive_element): Free symbols from old
bfd if !keep_memory.
* cofflink.c (coff_link_check_archive_element): Likewise.
* pdp11.c (aout_link_check_archive_element): Likewise.
* xcofflink.c (xcoff_link_check_archive_element): Likewise.
Diffstat (limited to 'bfd/vms-alpha.c')
| -rw-r--r-- | bfd/vms-alpha.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index ba195f9e71..309c3a241b 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -8220,7 +8220,6 @@ alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) symindex symidx; bfd *element; bfd *orig_element; - bfd *subsbfd; h = *pundef; next_pundef = &(*pundef)->u.undef.next; @@ -8278,14 +8277,10 @@ alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) /* Unlike the generic linker, we know that this element provides a definition for an undefined symbol and we know that we want to include it. We don't need to check anything. */ - subsbfd = NULL; - if (! (*info->callbacks->add_archive_element) - (info, element, h->root.string, &subsbfd)) + if (!(*info->callbacks + ->add_archive_element) (info, element, h->root.string, &element)) return FALSE; - /* Potentially, the add_archive_element hook may have set a - substitute BFD for us. */ - if (! alpha_vms_link_add_object_symbols (subsbfd ? subsbfd : element, - info)) + if (!alpha_vms_link_add_object_symbols (element, info)) return FALSE; orig_element->archive_pass = pass; |