From 7b20f09964ba4275768350a24fca109527a19425 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 27 Nov 2014 15:16:49 +1030 Subject: [PATCH] Don't output symbol version definitions for non-DT_NEEDED libs PR 16452, 16457 * elflink.c (_bfd_elf_link_find_version_dependencies): Exclude symbols from libraries that won't be listed in DT_NEEDED. (elf_link_output_extsym): Don't output verdefs for such symbols. --- bfd/ChangeLog | 7 +++++++ bfd/elflink.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8a52ebe7c4d..8bcbc1184e3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2014-11-30 Alan Modra + + PR 16452, 16457 + * elflink.c (_bfd_elf_link_find_version_dependencies): Exclude + symbols from libraries that won't be listed in DT_NEEDED. + (elf_link_output_extsym): Don't output verdefs for such symbols. + 2014-11-28 Alan Modra * elf.c (_bfd_elf_slurp_version_tables): Exit loops when vn_next/ diff --git a/bfd/elflink.c b/bfd/elflink.c index c8068c0118c..c964a98021c 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1832,7 +1832,9 @@ _bfd_elf_link_find_version_dependencies (struct elf_link_hash_entry *h, if (!h->def_dynamic || h->def_regular || h->dynindx == -1 - || h->verinfo.verdef == NULL) + || h->verinfo.verdef == NULL + || (elf_dyn_lib_class (h->verinfo.verdef->vd_bfd) + & (DYN_AS_NEEDED | DYN_DT_NEEDED | DYN_NO_NEEDED))) return TRUE; /* See if we already know about this version. */ @@ -9050,7 +9052,9 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) if (!h->def_regular) { - if (h->verinfo.verdef == NULL) + if (h->verinfo.verdef == NULL + || (elf_dyn_lib_class (h->verinfo.verdef->vd_bfd) + & (DYN_AS_NEEDED | DYN_DT_NEEDED | DYN_NO_NEEDED))) iversym.vs_vers = 0; else iversym.vs_vers = h->verinfo.verdef->vd_exp_refno + 1; -- 2.30.2