From 0a511368e2b896fe84f3b4bce5390e6269bcc57b Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Mon, 12 Oct 2015 17:33:28 +0200 Subject: [PATCH] S/390: ifunc: Fix for undefined ifunc symbols. bfd/ChangeLog: * elf32-s390.c (elf_s390_finish_dynamic_symbol): Call elf_s390_finish_ifunc_symbol only for actually defined symbols. * elf64-s390.c (elf_s390_finish_dynamic_symbol): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-s390.c | 17 ++++++++--------- bfd/elf64-s390.c | 19 +++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6eec6650a1b..44dd4d24587 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-10-22 Andreas Krebbel + + * elf32-s390.c (elf_s390_finish_dynamic_symbol): Call + elf_s390_finish_ifunc_symbol only for actually defined symbols. + * elf64-s390.c (elf_s390_finish_dynamic_symbol): Likewise. + 2015-10-22 Andreas Krebbel * elf-s390-common.c (s390_elf_allocate_ifunc_dyn_relocs): Remove diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 509d8f9d198..85ac2982252 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -3554,16 +3554,15 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd, /* This symbol has an entry in the procedure linkage table. Set it up. */ - if (s390_is_ifunc_symbol_p (h)) + if (s390_is_ifunc_symbol_p (h) && h->def_regular) { - /* If we can resolve the IFUNC symbol locally we generate an - IRELATIVE reloc. */ - elf_s390_finish_ifunc_symbol (output_bfd, info, h, htab, h->plt.offset, - eh->ifunc_resolver_address + - eh->ifunc_resolver_section->output_offset + - eh->ifunc_resolver_section->output_section->vma); - /* Fallthrough. Handling of explicit GOT slots of IFUNC - symbols is below. */ + elf_s390_finish_ifunc_symbol (output_bfd, info, h, + htab, h->plt.offset, + eh->ifunc_resolver_address + + eh->ifunc_resolver_section->output_offset + + eh->ifunc_resolver_section->output_section->vma); + /* Do not return yet. Handling of explicit GOT slots of + IFUNC symbols is below. */ } else { diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index d988b121c31..1add8d50100 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -3416,17 +3416,16 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd, /* This symbol has an entry in the procedure linkage table. Set it up. */ - if (s390_is_ifunc_symbol_p (h)) + if (s390_is_ifunc_symbol_p (h) && h->def_regular) { - /* If we can resolve the IFUNC symbol locally we generate an - IRELATIVE reloc. */ - elf_s390_finish_ifunc_symbol (output_bfd, info, h, htab, h->plt.offset, - eh->ifunc_resolver_address + - eh->ifunc_resolver_section->output_offset + - eh->ifunc_resolver_section->output_section->vma); - ; - /* Fallthrough. Handling of explicit GOT slots of IFUNC - symbols is below. */ + elf_s390_finish_ifunc_symbol (output_bfd, info, h, + htab, h->plt.offset, + eh->ifunc_resolver_address + + eh->ifunc_resolver_section->output_offset + + eh->ifunc_resolver_section->output_section->vma); + + /* Do not return yet. Handling of explicit GOT slots of + IFUNC symbols is below. */ } else { -- 2.30.2