From e81830c5c61a8665c098189d069cc68b0df113d3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 29 Dec 2016 22:49:41 +1030 Subject: [PATCH] link_hash_copy_indirect and symbol flags A while ago HJ fixed PR ld/18720 with commit 6e33951ed, which, among other things, modified _bfd_elf_link_hash_copy_indirect to not copy ref_dynamic, ref_regular, ref_regular_nonweak, non_got_ref, needs_plt and pointer_equality_needed when setting up an indirect non-versioned symbol pointing to a non-default versioned symbol. I didn't notice at the time, but the pr18720 testcase fails on hppa-linux with "internal error, aborting at binutils-gdb-2.28/bfd/elf32-hppa.c:3933 in elf32_hppa_relocate_section". Now hppa-linux creates entries in the plt even for local functions, if they are referenced using plabel (function pointer) relocations. So needs_plt is set for foo when processing pr18720a.o. When the aliases in pr28720b.o are processed, we get an indirection from foo to foo@FOO, but don't copy needs_plt. Since foo@FOO is the "real" symbol that is used after that point, no plt entry is made for foo and we bomb when relocating the plabel. As shown by the hppa-linux scenario, needs_plt should be copied even for non-default versioned symbols. I believe all of the others ought to be copied too, with the exception of ref_dynamic. Not copying ref_dynamic is right because if a shared lib references "foo" it should not be satisfied by any non-default version "foo@FOO". * elflink.c (_bfd_elf_link_hash_copy_indirect): Only omit copying one flag, ref_dynamic, when versioned_hidden. * elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise. * elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Use same logic for copying weakdef flags. Copy plabel flag and merge tls_type. * elf32-i386.c (elf_i386_copy_indirect_symbol): Use same logic for copying weakdef flags. * elf32-ppc.c (ppc_elf_copy_indirect_symbol): Likewise. * elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise. * elf32-sh.c (sh_elf_copy_indirect_symbol): Likewise. * elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise. * elfnn-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise. * elf64-x86-64.c (elf_x86_64_copy_indirect_symbol): Likewise. Simplify. --- bfd/ChangeLog | 18 ++++++++++++++++++ bfd/elf32-hppa.c | 15 ++++++++------- bfd/elf32-i386.c | 3 ++- bfd/elf32-ppc.c | 3 ++- bfd/elf32-s390.c | 3 ++- bfd/elf32-sh.c | 3 ++- bfd/elf64-ppc.c | 28 +++++++++++++--------------- bfd/elf64-s390.c | 3 ++- bfd/elf64-x86-64.c | 14 +++++--------- bfd/elflink.c | 17 +++++++---------- bfd/elfnn-ia64.c | 3 ++- 11 files changed, 63 insertions(+), 47 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d1b012fe0bc..bee5e402221 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,21 @@ +2016-12-29 Alan Modra + + * elflink.c (_bfd_elf_link_hash_copy_indirect): Only omit + copying one flag, ref_dynamic, when versioned_hidden. + * elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise. + * elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Use same + logic for copying weakdef flags. Copy plabel flag and merge + tls_type. + * elf32-i386.c (elf_i386_copy_indirect_symbol): Use same logic + for copying weakdef flags. + * elf32-ppc.c (ppc_elf_copy_indirect_symbol): Likewise. + * elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise. + * elf32-sh.c (sh_elf_copy_indirect_symbol): Likewise. + * elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise. + * elfnn-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise. + * elf64-x86-64.c (elf_x86_64_copy_indirect_symbol): Likewise. + Simplify. + 2016-12-28 Alan Modra PR ld/20995 diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index cbe42cfde9f..eab384b7ed7 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -1056,19 +1056,20 @@ elf32_hppa_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - eh_dir->ref_dynamic |= eh_ind->ref_dynamic; + if (eh_dir->versioned != versioned_hidden) + eh_dir->ref_dynamic |= eh_ind->ref_dynamic; eh_dir->ref_regular |= eh_ind->ref_regular; eh_dir->ref_regular_nonweak |= eh_ind->ref_regular_nonweak; eh_dir->needs_plt |= eh_ind->needs_plt; } else { - if (eh_ind->root.type == bfd_link_hash_indirect - && eh_dir->got.refcount <= 0) - { - hh_dir->tls_type = hh_ind->tls_type; - hh_ind->tls_type = GOT_UNKNOWN; - } + if (eh_ind->root.type == bfd_link_hash_indirect) + { + hh_dir->plabel |= hh_ind->plabel; + hh_dir->tls_type |= hh_ind->tls_type; + hh_ind->tls_type = GOT_UNKNOWN; + } _bfd_elf_link_hash_copy_indirect (info, eh_dir, eh_ind); } diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 8f4477d00ef..0846cae689a 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1168,7 +1168,8 @@ elf_i386_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - dir->ref_dynamic |= ind->ref_dynamic; + if (dir->versioned != versioned_hidden) + dir->ref_dynamic |= ind->ref_dynamic; dir->ref_regular |= ind->ref_regular; dir->ref_regular_nonweak |= ind->ref_regular_nonweak; dir->needs_plt |= ind->needs_plt; diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index e65ff615a44..05b99095246 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -3606,7 +3606,8 @@ ppc_elf_copy_indirect_symbol (struct bfd_link_info *info, && edir->elf.dynamic_adjusted)) edir->elf.non_got_ref |= eind->elf.non_got_ref; - edir->elf.ref_dynamic |= eind->elf.ref_dynamic; + if (edir->elf.versioned != versioned_hidden) + edir->elf.ref_dynamic |= eind->elf.ref_dynamic; edir->elf.ref_regular |= eind->elf.ref_regular; edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; edir->elf.needs_plt |= eind->elf.needs_plt; diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index b52144aaaa1..ae8b5b969f0 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -873,7 +873,8 @@ elf_s390_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - dir->ref_dynamic |= ind->ref_dynamic; + if (dir->versioned != versioned_hidden) + dir->ref_dynamic |= ind->ref_dynamic; dir->ref_regular |= ind->ref_regular; dir->ref_regular_nonweak |= ind->ref_regular_nonweak; dir->needs_plt |= ind->needs_plt; diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 5da1d088f57..9dd1157cf60 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -5733,7 +5733,8 @@ sh_elf_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - dir->ref_dynamic |= ind->ref_dynamic; + if (dir->versioned != versioned_hidden) + dir->ref_dynamic |= ind->ref_dynamic; dir->ref_regular |= ind->ref_regular; dir->ref_regular_nonweak |= ind->ref_regular_nonweak; dir->needs_plt |= ind->needs_plt; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 9520777f1e0..b838cde0e0d 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -4713,22 +4713,20 @@ ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info, if (eind->oh != NULL) edir->oh = ppc_follow_link (eind->oh); - if (edir->elf.versioned != versioned_hidden) - { - /* If called to transfer flags for a weakdef during processing - of elf_adjust_dynamic_symbol, don't copy NON_GOT_REF. - We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - if (!(ELIMINATE_COPY_RELOCS - && eind->elf.root.type != bfd_link_hash_indirect - && edir->elf.dynamic_adjusted)) - edir->elf.non_got_ref |= eind->elf.non_got_ref; + /* If called to transfer flags for a weakdef during processing + of elf_adjust_dynamic_symbol, don't copy NON_GOT_REF. + We clear it ourselves for ELIMINATE_COPY_RELOCS. */ + if (!(ELIMINATE_COPY_RELOCS + && eind->elf.root.type != bfd_link_hash_indirect + && edir->elf.dynamic_adjusted)) + edir->elf.non_got_ref |= eind->elf.non_got_ref; - edir->elf.ref_dynamic |= eind->elf.ref_dynamic; - edir->elf.ref_regular |= eind->elf.ref_regular; - edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; - edir->elf.needs_plt |= eind->elf.needs_plt; - edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed; - } + if (edir->elf.versioned != versioned_hidden) + edir->elf.ref_dynamic |= eind->elf.ref_dynamic; + edir->elf.ref_regular |= eind->elf.ref_regular; + edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; + edir->elf.needs_plt |= eind->elf.needs_plt; + edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed; /* If we were called to copy over info for a weak sym, don't copy dyn_relocs, plt/got info, or dynindx. We used to copy dyn_relocs diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 64a74c5dfcd..5dfee1c3cb6 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -785,7 +785,8 @@ elf_s390_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - dir->ref_dynamic |= ind->ref_dynamic; + if (dir->versioned != versioned_hidden) + dir->ref_dynamic |= ind->ref_dynamic; dir->ref_regular |= ind->ref_regular; dir->ref_regular_nonweak |= ind->ref_regular_nonweak; dir->needs_plt |= ind->needs_plt; diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 5b3dd8a09a1..412bd9cca59 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -1164,14 +1164,9 @@ elf_x86_64_copy_indirect_symbol (struct bfd_link_info *info, edir = (struct elf_x86_64_link_hash_entry *) dir; eind = (struct elf_x86_64_link_hash_entry *) ind; - if (!edir->has_bnd_reloc) - edir->has_bnd_reloc = eind->has_bnd_reloc; - - if (!edir->has_got_reloc) - edir->has_got_reloc = eind->has_got_reloc; - - if (!edir->has_non_got_reloc) - edir->has_non_got_reloc = eind->has_non_got_reloc; + edir->has_bnd_reloc |= eind->has_bnd_reloc; + edir->has_got_reloc |= eind->has_got_reloc; + edir->has_non_got_reloc |= eind->has_non_got_reloc; if (eind->dyn_relocs != NULL) { @@ -1218,7 +1213,8 @@ elf_x86_64_copy_indirect_symbol (struct bfd_link_info *info, /* If called to transfer flags for a weakdef during processing of elf_adjust_dynamic_symbol, don't copy non_got_ref. We clear it ourselves for ELIMINATE_COPY_RELOCS. */ - dir->ref_dynamic |= ind->ref_dynamic; + if (dir->versioned != versioned_hidden) + dir->ref_dynamic |= ind->ref_dynamic; dir->ref_regular |= ind->ref_regular; dir->ref_regular_nonweak |= ind->ref_regular_nonweak; dir->needs_plt |= ind->needs_plt; diff --git a/bfd/elflink.c b/bfd/elflink.c index 2fd8883fd60..81cd236961a 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -7102,18 +7102,15 @@ _bfd_elf_link_hash_copy_indirect (struct bfd_link_info *info, struct elf_link_hash_table *htab; /* Copy down any references that we may have already seen to the - symbol which just became indirect if DIR isn't a hidden versioned - symbol. */ + symbol which just became indirect. */ if (dir->versioned != versioned_hidden) - { - dir->ref_dynamic |= ind->ref_dynamic; - dir->ref_regular |= ind->ref_regular; - dir->ref_regular_nonweak |= ind->ref_regular_nonweak; - dir->non_got_ref |= ind->non_got_ref; - dir->needs_plt |= ind->needs_plt; - dir->pointer_equality_needed |= ind->pointer_equality_needed; - } + dir->ref_dynamic |= ind->ref_dynamic; + dir->ref_regular |= ind->ref_regular; + dir->ref_regular_nonweak |= ind->ref_regular_nonweak; + dir->non_got_ref |= ind->non_got_ref; + dir->needs_plt |= ind->needs_plt; + dir->pointer_equality_needed |= ind->pointer_equality_needed; if (ind->root.type != bfd_link_hash_indirect) return; diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index 32f94111db7..02340420891 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -1274,7 +1274,8 @@ elfNN_ia64_hash_copy_indirect (struct bfd_link_info *info, /* Copy down any references that we may have already seen to the symbol which just became indirect. */ - dir->root.ref_dynamic |= ind->root.ref_dynamic; + if (dir->root.versioned != versioned_hidden) + dir->root.ref_dynamic |= ind->root.ref_dynamic; dir->root.ref_regular |= ind->root.ref_regular; dir->root.ref_regular_nonweak |= ind->root.ref_regular_nonweak; dir->root.needs_plt |= ind->root.needs_plt; -- 2.30.2