about summary refs log tree commit diff
path: root/sysdeps/x86_64
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/x86_64
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/x86_64')
-rw-r--r--sysdeps/x86_64/dl-machine.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index f17f5fb7cd..58260c7876 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -512,7 +512,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 #  endif
 	case R_X86_64_IRELATIVE:
 	  value = map->l_addr + reloc->r_addend;
-	  value = ((ElfW(Addr) (*) (void)) value) ();
+	  if (__glibc_likely (!skip_ifunc))
+	    value = ((ElfW(Addr) (*) (void)) value) ();
 	  *reloc_addr = value;
 	  break;
 	default: