From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue, 17 Dec 2019 18:55:59 +0000 (-0300)
Subject: powerpc: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214]
X-Git-Tag: upstream/2.34~2488
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0331bffe1be698d32c3b4a93b6e7f02d1f1b47fb;p=platform%2Fupstream%2Fglibc.git

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

diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c
index d3ce2c1..a90cbc1 100644
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@@ -414,7 +414,7 @@ __process_machine_rela (struct link_map *map,
 			const Elf32_Sym *refsym,
 			Elf32_Addr *const reloc_addr,
 			Elf32_Addr const finaladdr,
-			int rinfo)
+			int rinfo, bool skip_ifunc)
 {
   union unaligned
     {
@@ -434,7 +434,8 @@ __process_machine_rela (struct link_map *map,
       return;
 
     case R_PPC_IRELATIVE:
-      *reloc_addr = ((Elf32_Addr (*) (void)) finaladdr) ();
+      if (__glibc_likely (!skip_ifunc))
+	*reloc_addr = ((Elf32_Addr (*) (void)) finaladdr) ();
       return;
 
     case R_PPC_UADDR32:
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h
index 5286901..4b12652 100644
--- a/sysdeps/powerpc/powerpc32/dl-machine.h
+++ b/sysdeps/powerpc/powerpc32/dl-machine.h
@@ -273,7 +273,8 @@ extern void __process_machine_rela (struct link_map *map,
 				    const Elf32_Sym *refsym,
 				    Elf32_Addr *const reloc_addr,
 				    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.  */
 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:
       __process_machine_rela (map, reloc, sym_map, sym, refsym,
-			      reloc_addr, value, r_type);
+			      reloc_addr, value, r_type, skip_ifunc);
     }
 }