[10/28] elf: Use the term "program interpreter" in the ld.so help message
Commit Message
This is the term that the ELF standard itself uses.
---
elf/dl-usage.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Comments
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote:
> This is the term that the ELF standard itself uses.
> ---
> elf/dl-usage.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/elf/dl-usage.c b/elf/dl-usage.c
> index 7355b094a5..35a1c0c455 100644
> --- a/elf/dl-usage.c
> +++ b/elf/dl-usage.c
> @@ -51,17 +51,17 @@ _dl_help (const char *argv0, struct dl_main_state *state)
> {
> _dl_printf ("\
> Usage: %s [OPTION]... EXECUTABLE-FILE [ARGS-FOR-PROGRAM...]\n\
> -You have invoked `ld.so', the helper program for shared library executables.\n\
> -This program usually lives in the file `/lib/ld.so', and special directives\n\
> -in executable files using ELF shared libraries tell the system's program\n\
> -loader to load the helper program from this file. This helper program loads\n\
> -the shared libraries needed by the program executable, prepares the program\n\
> -to run, and runs it. You may invoke this helper program directly from the\n\
> +You have invoked 'ld.so', the program interpreter for dynamically-linked\n\
> +ELF programs. Usually, the program interpreter is invoked automatically\n\
> +when a dynamically-linked executable is started.\n\
> +\n\
> +You may invoke the program interpreter program directly from the\n\
> command line to load and run an ELF executable file; this is like executing\n\
> -that file itself, but always uses this helper program from the file you\n\
> -specified, instead of the helper program file specified in the executable\n\
> -file you run. This is mostly of use for maintainers to test new versions\n\
> -of this helper program; chances are you did not intend to run this program.\n\
> +that file itself, but always uses the invoked program interpreter you\n\
> +invoked, instead of the program interpreter specified in the executable\n\
> +file you run. Invoking the program interpreter directly provides access to\n\
> +additional diagnostics, and changing the dynamic linker behavior without\n\
> +setting environment variables (which would be inherted by subprocesses).\n\
s/inherted/inherited
> \n\
> --list list all dependencies and how they are resolved\n\
> --verify verify that given object really is a dynamically linked\n\
>
* Adhemerval Zanella via Libc-alpha:
>> +that file itself, but always uses the invoked program interpreter you\n\
>> +invoked, instead of the program interpreter specified in the executable\n\
>> +file you run. Invoking the program interpreter directly provides access to\n\
>> +additional diagnostics, and changing the dynamic linker behavior without\n\
>> +setting environment variables (which would be inherted by subprocesses).\n\
>
> s/inherted/inherited
Pushed with this fixed, and also cut back a bit on the invoking. Thanks.
Florian
@@ -51,17 +51,17 @@ _dl_help (const char *argv0, struct dl_main_state *state)
{
_dl_printf ("\
Usage: %s [OPTION]... EXECUTABLE-FILE [ARGS-FOR-PROGRAM...]\n\
-You have invoked `ld.so', the helper program for shared library executables.\n\
-This program usually lives in the file `/lib/ld.so', and special directives\n\
-in executable files using ELF shared libraries tell the system's program\n\
-loader to load the helper program from this file. This helper program loads\n\
-the shared libraries needed by the program executable, prepares the program\n\
-to run, and runs it. You may invoke this helper program directly from the\n\
+You have invoked 'ld.so', the program interpreter for dynamically-linked\n\
+ELF programs. Usually, the program interpreter is invoked automatically\n\
+when a dynamically-linked executable is started.\n\
+\n\
+You may invoke the program interpreter program directly from the\n\
command line to load and run an ELF executable file; this is like executing\n\
-that file itself, but always uses this helper program from the file you\n\
-specified, instead of the helper program file specified in the executable\n\
-file you run. This is mostly of use for maintainers to test new versions\n\
-of this helper program; chances are you did not intend to run this program.\n\
+that file itself, but always uses the invoked program interpreter you\n\
+invoked, instead of the program interpreter specified in the executable\n\
+file you run. Invoking the program interpreter directly provides access to\n\
+additional diagnostics, and changing the dynamic linker behavior without\n\
+setting environment variables (which would be inherted by subprocesses).\n\
\n\
--list list all dependencies and how they are resolved\n\
--verify verify that given object really is a dynamically linked\n\