about summary refs log tree commit diff
path: root/sysdeps/sparc/sparc32/dl-machine.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-11-29 17:55:22 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-12-02 14:55:22 +0100
commit4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3 (patch)
tree8f3c89f67d8600bc928337dc226f3a107a904dc1 /sysdeps/sparc/sparc32/dl-machine.h
parent61a7c9df71ee4e6f94b56c20f0d37c6e17d5f284 (diff)
downloadglibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.tar.gz
glibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.tar.xz
glibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.zip
elf: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214]
This commit adds missing skip_ifunc checks to aarch64, arm, i386,
sparc, and x86_64.  A new test case ensures that IRELATIVE IFUNC
resolvers do not run in various diagnostic modes of the dynamic
loader.

Reviewed-By: Szabolcs Nagy <szabolcs.nagy@arm.com>
Diffstat (limited to 'sysdeps/sparc/sparc32/dl-machine.h')
-rw-r--r--sysdeps/sparc/sparc32/dl-machine.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index 1d8da32c47..359a004271 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -425,11 +425,13 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
       *reloc_addr = value;
       break;
     case R_SPARC_IRELATIVE:
-      value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
+      if (__glibc_likely (!skip_ifunc))
+	value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
       *reloc_addr = value;
       break;
     case R_SPARC_JMP_IREL:
-      value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
+      if (__glibc_likely (!skip_ifunc))
+	value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
       /* Fall thru */
     case R_SPARC_JMP_SLOT:
       {