From 56f8d442942ee51824b4683be83f776a811a3f2a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Oct 2020 16:40:23 +0200 Subject: elf: Do not search HWCAP subdirectories in statically linked binaries This functionality does not seem to be useful since static dlopen is mostly used for iconv/character set conversion and NSS support. gconv modules are loaded with full paths anyway, so that the HWCAP subdirectory logic does not apply. Reviewed-by: Adhemerval Zanella --- elf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index c587e9f06e..e0a8bf2998 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -29,7 +29,7 @@ routines = $(all-dl-routines) dl-support dl-iteratephdr \ # The core dynamic linking functions are in libc for the static and # profiled libraries. -dl-routines = $(addprefix dl-,load lookup object reloc deps hwcaps \ +dl-routines = $(addprefix dl-,load lookup object reloc deps \ runtime init fini debug misc \ version profile tls origin scope \ execstack open close trampoline \ @@ -59,7 +59,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \ # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \ - dl-error-minimal dl-conflict + dl-error-minimal dl-conflict dl-hwcaps all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables -- cgit 1.4.1