From e81830c5c61a8665c098189d069cc68b0df113d3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 29 Dec 2016 22:49:41 +1030 Subject: 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/elf32-sh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bfd/elf32-sh.c') 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; -- cgit v1.2.1