aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/aarch64/dl-machine.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-11-29 16:37:58 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-11-29 16:37:58 +0100
commit6029860f6fb465ac35c68c71e3899b9b872b6b26 (patch)
treeea9df4b6c0c1d30b02b9f08077498b723466bac6 /sysdeps/aarch64/dl-machine.h
parenta331150af65477fc3fa72ab341eed5e0b2daf7f3 (diff)
downloadglibc-fw/bug24214.tar.xz
glibc-fw/bug24214.zip
elf: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214]fw/bug24214
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. Tested on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu, s390-linux-gnu, s390x-linux-gnu, powerpc64le-linux-gnu. Built with build-many-glibcs.py.
Diffstat (limited to 'sysdeps/aarch64/dl-machine.h')
-rw-r--r--sysdeps/aarch64/dl-machine.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 10b91c33ae..bf6b9d0e7d 100644
--- a/sysdeps/aarch64/dl-machine.h
+++ b/sysdeps/aarch64/dl-machine.h
@@ -358,7 +358,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
case AARCH64_R(IRELATIVE):
value = map->l_addr + reloc->r_addend;
- value = elf_ifunc_invoke (value);
+ if (__glibc_likely (!skip_ifunc))
+ value = elf_ifunc_invoke (value);
*reloc_addr = value;
break;