From 6628c742b2c16e785d3c884d9deeda5adb30ca12 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 13 Jan 2022 17:58:00 -0300 Subject: elf: Remove prelink support Prelinked binaries and libraries still work, the dynamic tags DT_GNU_PRELINKED, DT_GNU_LIBLIST, DT_GNU_CONFLICT just ignored (meaning the process is reallocated as default). The loader environment variable TRACE_PRELINKING is also removed, since it used solely on prelink. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Siddhesh Poyarekar --- elf/Makefile | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index b2bd03a..bff9495 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -127,7 +127,6 @@ rtld-routines = \ $(all-dl-routines) \ dl-audit \ dl-compat \ - dl-conflict \ dl-diagnostics \ dl-diagnostics-cpu \ dl-diagnostics-kernel \ @@ -1103,14 +1102,6 @@ tests-special += $(objpfx)check-abi-ld.out update-abi: update-abi-ld update-all-abi: update-all-abi-ld -ifeq ($(have-glob-dat-reloc),yes) -tests += tst-prelink -tests-internal += tst-prelink-cmp -# Don't compile tst-prelink.c with PIE for GLOB_DAT relocation. -CFLAGS-tst-prelink.c += -fno-pie -tst-prelink-no-pie = yes -endif - # The test requires shared _and_ PIE because the executable # unit test driver must be able to link with the shared object # that is going to eventually go into an installed DSO. @@ -2285,13 +2276,6 @@ $(objpfx)tst-tls-manydynamic: $(shared-thread-library) $(objpfx)tst-tls-manydynamic.out: \ $(patsubst %,$(objpfx)%.so,$(tst-tls-many-dynamic-modules)) -tst-prelink-ENV = LD_TRACE_PRELINKING=1 - -$(objpfx)tst-prelink-conflict.out: $(objpfx)tst-prelink.out - grep stdout $< | grep conflict | $(AWK) '{ print $$10, $$11 }' > $@ - -$(objpfx)tst-prelink-cmp.out: $(objpfx)tst-prelink-conflict.out - $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' \ '$(run-program-env)' > $@; \ -- cgit v1.1