summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-10-08 15:33:00 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-10-08 17:12:05 +0200
commitdb03874df9843ab98c4faeb658f04d17e6db83a6 (patch)
treebb4876b5e76f22470859d4d64262375db8e2b86b
parentca52c56abf50b89a95dc2a4a5504c0d7d3862961 (diff)
downloadglibc-db03874df9843ab98c4faeb658f04d17e6db83a6.tar.gz
elf: Print the full name of the dynamic loader in the ld.so help message
This requires defining a macro for the full path, matching the -Wl,--dynamic-link= arguments used for linking glibc programs, and ldd script. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--elf/Makefile3
-rw-r--r--elf/dl-usage.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 8cdc44fdf1..f10cc59e7c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -661,7 +661,8 @@ libof-ldconfig = ldconfig
CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)
CFLAGS-cache.c += $(SYSCONF-FLAGS)
CFLAGS-rtld.c += $(SYSCONF-FLAGS)
-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS)
+CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \
+ -D'RTLD="$(rtlddir)/$(rtld-installed-name)"'
cpp-srcs-left := $(all-rtld-routines:=.os)
lib := rtld
diff --git a/elf/dl-usage.c b/elf/dl-usage.c
index 8c24c13770..1003a435bf 100644
--- a/elf/dl-usage.c
+++ b/elf/dl-usage.c
@@ -76,6 +76,8 @@ setting environment variables (which would be inherited by subprocesses).\n\
--argv0 STRING set argv[0] to STRING before running\n\
--help display this help and exit\n\
--version output version information and exit\n\
+\n\
+This program interpreter self-identifies as: " RTLD "\n\
",
argv0);
_exit (EXIT_SUCCESS);