1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00

powerpc: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214]

This patch adds the missing bits for powerpc and fixes both
tst-ifunc-fault-lazy and tst-ifunc-fault-bindnow failures on
powerpc-linux-gnu.

Checked on powerpc-linux-gnu and powerpc-linux-gnu-power4.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
This commit is contained in:
Adhemerval Zanella
2019-12-17 15:55:59 -03:00
parent 3dcad8158f
commit 0331bffe1b
2 changed files with 6 additions and 4 deletions

View File

@@ -414,7 +414,7 @@ __process_machine_rela (struct link_map *map,
const Elf32_Sym *refsym, const Elf32_Sym *refsym,
Elf32_Addr *const reloc_addr, Elf32_Addr *const reloc_addr,
Elf32_Addr const finaladdr, Elf32_Addr const finaladdr,
int rinfo) int rinfo, bool skip_ifunc)
{ {
union unaligned union unaligned
{ {
@@ -434,7 +434,8 @@ __process_machine_rela (struct link_map *map,
return; return;
case R_PPC_IRELATIVE: case R_PPC_IRELATIVE:
*reloc_addr = ((Elf32_Addr (*) (void)) finaladdr) (); if (__glibc_likely (!skip_ifunc))
*reloc_addr = ((Elf32_Addr (*) (void)) finaladdr) ();
return; return;
case R_PPC_UADDR32: case R_PPC_UADDR32:

View File

@@ -273,7 +273,8 @@ extern void __process_machine_rela (struct link_map *map,
const Elf32_Sym *refsym, const Elf32_Sym *refsym,
Elf32_Addr *const reloc_addr, Elf32_Addr *const reloc_addr,
Elf32_Addr finaladdr, Elf32_Addr finaladdr,
int rinfo) attribute_hidden; int rinfo, bool skip_ifunc)
attribute_hidden;
/* Call _dl_signal_error when a resolved value overflows a relocated area. */ /* Call _dl_signal_error when a resolved value overflows a relocated area. */
extern void _dl_reloc_overflow (struct link_map *map, extern void _dl_reloc_overflow (struct link_map *map,
@@ -436,7 +437,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
default: default:
__process_machine_rela (map, reloc, sym_map, sym, refsym, __process_machine_rela (map, reloc, sym_map, sym, refsym,
reloc_addr, value, r_type); reloc_addr, value, r_type, skip_ifunc);
} }
} }