diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/elf-s390-common.c | 4 | ||||
| -rw-r--r-- | bfd/elf32-s390.c | 2 | ||||
| -rw-r--r-- | bfd/elf64-s390.c | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c index 1570365..8795fb9 100644 --- a/bfd/elf-s390-common.c +++ b/bfd/elf-s390-common.c @@ -161,9 +161,7 @@ keep: h->type = STT_FUNC; } - /* We need dynamic relocation for STT_GNU_IFUNC symbol only when - there is a non-GOT reference in a shared object. */ - if (!bfd_link_pic (info) || !h->non_got_ref) + if (!bfd_link_pic (info)) *head = NULL; /* Finally, allocate space. */ diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index ddb6f5b..8a09a31 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -2774,7 +2774,7 @@ elf_s390_relocate_section (bfd *output_bfd, && s390_is_ifunc_symbol_p (h) && h->def_regular) { - if (!bfd_link_pic (info) || !h->non_got_ref) + if (!bfd_link_pic (info)) { /* For a non-shared object STT_GNU_IFUNC symbol must go through PLT. */ diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index fbbf8d6..ca3541f 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -2737,10 +2737,11 @@ elf_s390_relocate_section (bfd *output_bfd, && s390_is_ifunc_symbol_p (h) && h->def_regular) { - if (!bfd_link_pic (info) || !h->non_got_ref) + if (!bfd_link_pic (info)) { - /* For a non-shared object STT_GNU_IFUNC symbol must - go through PLT. */ + /* For a non-shared object the symbol will not + change. Hence we can write the address of the + target IPLT slot now. */ relocation = (htab->elf.iplt->output_section->vma + htab->elf.iplt->output_offset + h ->plt.offset); |