From f3fd569c365ca5149fedbbc6c7a902aa1f8e5b60 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 22 Aug 2012 00:43:21 +0000 Subject: rtld: limit self loading check to normal mode only Commit glibc-2.14~10 disallowed rtld self loading to avoid a segfault that used to happen when rtld was loading itself in normal mode. Unfortunately, that commit disallowed all modes of self loading, including those that used to work before. This change limits the check for self loading to normal mode only, so that instruments like ldd could handle rtld properly. --- elf/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index b99937624c..c844739adc 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -434,7 +434,7 @@ generated += $(addsuffix .so,$(strip $(modules-names))) ifeq (yes,$(build-shared)) ifeq ($(cross-compiling),no) -tests: $(objpfx)tst-pathopt.out +tests: $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out endif endif @@ -707,6 +707,9 @@ $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(objpfx)pathoptobj.so $(SHELL) -e $< $(common-objpfx) +$(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so + $(SHELL) $^ > $@ + $(objpfx)initfirst: $(libdl) $(objpfx)initfirst.out: $(objpfx)firstobj.so -- cgit 1.4.1