FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

S/390: ifunc: Fix for undefined ifunc symbols.

Browse source 
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.
This commit is contained in:
Andreas Krebbel 2015-10-12 17:33:28 +02:00
parent e44c481aff
commit 0a511368e2
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2015-10-22 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* 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 <krebbel@linux.vnet.ibm.com>
* elf-s390-common.c (s390_elf_allocate_ifunc_dyn_relocs): Remove

17
bfd/elf32-s390.c
View file

@ -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
{

19
bfd/elf64-s390.c
View file

@ -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
{