From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH 05/28] elf: Move ld.so error/help output to _dl_usage
Date: Tue, 6 Oct 2020 18:06:08 -0300 [thread overview]
Message-ID: <615ab9ee-2313-587d-6f6f-8450752b889e@linaro.org> (raw)
In-Reply-To: <82d06d8f60646b8f6e7f13ba42668e3ea10e0268.1601569371.git.fweimer@redhat.com>
On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote:
> Also add a comment to elf/Makefile, explaining why we cannot use
> config.status for autoconf template processing.
LGTM, with just a nit below.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> elf/Makefile | 9 ++++++++-
> elf/dl-main.h | 5 +++++
> elf/dl-usage.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
> elf/rtld.c | 26 +------------------------
> 4 files changed, 65 insertions(+), 26 deletions(-)
> create mode 100644 elf/dl-usage.c
>
> diff --git a/elf/Makefile b/elf/Makefile
> index ab792d45c2..71602d04c1 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -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-hwcaps
> + dl-error-minimal dl-conflict dl-hwcaps dl-usage
> all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
>
> CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables
Ok.
> @@ -618,6 +618,12 @@ ldso_install: $(inst_rtlddir)/$(rtld-installed-name)
> endif
>
>
> +# Workarounds for ${exec_prefix} expansion in configure variables.
> +# config.status cannot be used directly for processing ldd.bash.in or
> +# expanding variables such as sysconfdir because the expansion
> +# contains the literal string ${exec_prefix}, which is not valid in C
> +# headers or installed shell scripts.
> +
> ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
> -e 's%@VERSION@%$(version)%g' \
> -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
> @@ -655,6 +661,7 @@ 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)
>
> cpp-srcs-left := $(all-rtld-routines:=.os)
> lib := rtld
Ok.
> diff --git a/elf/dl-main.h b/elf/dl-main.h
> index ad9250171f..681f366871 100644
> --- a/elf/dl-main.h
> +++ b/elf/dl-main.h
> @@ -19,7 +19,9 @@
> #ifndef _DL_MAIN
> #define _DL_MAIN
>
> +#include <ldsodefs.h>
> #include <limits.h>
> +#include <stdlib.h>
>
> /* Length limits for names and paths, to protect the dynamic linker,
> particularly when __libc_enable_secure is active. */
> @@ -92,4 +94,7 @@ call_init_paths (const struct dl_main_state *state)
> _dl_init_paths (state->library_path);
> }
>
> +/* Print ld.so usage information and exit. */
> +void _dl_usage (void) attribute_hidden __attribute__ ((__noreturn__));
> +
> #endif /* _DL_MAIN */
Why not use C11 _Noreturn?
> diff --git a/elf/dl-usage.c b/elf/dl-usage.c
> new file mode 100644
> index 0000000000..f3d89d22b7
> --- /dev/null
> +++ b/elf/dl-usage.c
> @@ -0,0 +1,51 @@
> +/* Print usage information and help for ld.so.
> + Copyright (C) 1995-2020 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <dl-cache.h>
> +#include <dl-main.h>
> +#include <ldsodefs.h>
> +
> +void
> +_dl_usage (void)
> +{
> + _dl_fatal_printf ("\
> +Usage: ld.so [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\
> +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\
> +\n\
> + --list list all dependencies and how they are resolved\n\
> + --verify verify that given object really is a dynamically linked\n\
> + object we can handle\n\
> + --inhibit-cache Do not use " LD_SO_CACHE "\n\
> + --library-path PATH use given PATH instead of content of the environment\n\
> + variable LD_LIBRARY_PATH\n\
> + --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\
> + in LIST\n\
> + --audit LIST use objects named in LIST as auditors\n\
> + --preload LIST preload objects named in LIST\n\
> + --argv0 STRING set argv[0] to STRING before running\n");
> +}
Ok.
> diff --git a/elf/rtld.c b/elf/rtld.c
> index c1153cb627..f3e1791e2f 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -1246,31 +1246,7 @@ dl_main (const ElfW(Phdr) *phdr,
> /* If we have no further argument the program was called incorrectly.
> Grant the user some education. */
> if (_dl_argc < 2)
> - _dl_fatal_printf ("\
> -Usage: ld.so [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\
> -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\
> -\n\
> - --list list all dependencies and how they are resolved\n\
> - --verify verify that given object really is a dynamically linked\n\
> - object we can handle\n\
> - --inhibit-cache Do not use " LD_SO_CACHE "\n\
> - --library-path PATH use given PATH instead of content of the environment\n\
> - variable LD_LIBRARY_PATH\n\
> - --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\
> - in LIST\n\
> - --audit LIST use objects named in LIST as auditors\n\
> - --preload LIST preload objects named in LIST\n\
> - --argv0 STRING set argv[0] to STRING before running\n");
> + _dl_usage ();
>
> ++_dl_skip_args;
> --_dl_argc;
>
Ok.
next prev parent reply other threads:[~2020-10-06 21:06 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 16:31 [PATCH 00/28] glibc-hwcaps support Florian Weimer via Libc-alpha
2020-10-01 16:31 ` [PATCH 01/28] elf: Do not search HWCAP subdirectories in statically linked binaries Florian Weimer via Libc-alpha
2020-10-01 18:22 ` Adhemerval Zanella via Libc-alpha
2020-10-01 18:24 ` Carlos O'Donell via Libc-alpha
2020-10-01 18:29 ` Adhemerval Zanella via Libc-alpha
2020-10-01 20:24 ` Carlos O'Donell via Libc-alpha
2020-10-01 16:31 ` [PATCH 02/28] elf: Implement __rtld_malloc_is_full Florian Weimer via Libc-alpha
2020-10-01 18:23 ` Adhemerval Zanella via Libc-alpha
2020-10-08 9:44 ` Florian Weimer via Libc-alpha
2020-10-01 16:31 ` [PATCH 03/28] elf: Implement _dl_write Florian Weimer via Libc-alpha
2020-10-05 19:46 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:31 ` [PATCH 04/28] elf: Extract command-line/environment variables state from rtld.c Florian Weimer via Libc-alpha
2020-10-06 20:45 ` Adhemerval Zanella via Libc-alpha
2020-10-08 11:32 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 05/28] elf: Move ld.so error/help output to _dl_usage Florian Weimer via Libc-alpha
2020-10-06 21:06 ` Adhemerval Zanella via Libc-alpha [this message]
2020-10-08 12:19 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 06/28] elf: Record whether paths come from LD_LIBRARY_PATH or --library-path Florian Weimer via Libc-alpha
2020-10-07 16:39 ` Adhemerval Zanella via Libc-alpha
2020-10-07 16:49 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 07/28] elf: Implement ld.so --help Florian Weimer via Libc-alpha
2020-10-07 17:16 ` Adhemerval Zanella via Libc-alpha
2020-10-08 13:13 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 08/28] elf: Implement ld.so --version Florian Weimer via Libc-alpha
2020-10-07 18:36 ` Adhemerval Zanella via Libc-alpha
2020-10-07 18:38 ` Adhemerval Zanella via Libc-alpha
2020-10-08 13:37 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 09/28] scripts/update-copyrights: Update csu/version.c, elf/dl-usage.c Florian Weimer via Libc-alpha
2020-10-07 18:41 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 10/28] elf: Use the term "program interpreter" in the ld.so help message Florian Weimer via Libc-alpha
2020-10-07 21:08 ` Adhemerval Zanella via Libc-alpha
2020-10-08 14:08 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 11/28] elf: Print the full name of the dynamic loader " Florian Weimer via Libc-alpha
2020-10-08 12:38 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 12/28] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables Florian Weimer via Libc-alpha
2020-10-08 13:27 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 13/28] elf: Add library search path information to ld.so --help Florian Weimer via Libc-alpha
2020-10-08 16:22 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` [PATCH 14/28] elf: Enhance ld.so --help to print HWCAP subdirectories Florian Weimer via Libc-alpha
2020-10-08 16:27 ` Adhemerval Zanella via Libc-alpha
2020-10-09 8:18 ` Florian Weimer via Libc-alpha
2020-10-09 13:49 ` Matheus Castanho via Libc-alpha
2020-10-09 17:08 ` Florian Weimer via Libc-alpha
2020-10-09 17:12 ` Florian Weimer via Libc-alpha
2020-10-09 18:54 ` Matheus Castanho via Libc-alpha
2020-10-12 9:47 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 15/28] elf: Do not pass GLRO(dl_platform), GLRO(dl_platformlen) to _dl_important_hwcaps Florian Weimer via Libc-alpha
2020-10-08 18:04 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` [PATCH 16/28] elf: Add glibc-hwcaps support for LD_LIBRARY_PATH Florian Weimer via Libc-alpha
2020-10-08 10:13 ` Szabolcs Nagy via Libc-alpha
2020-10-09 9:08 ` Florian Weimer via Libc-alpha
2020-10-09 10:50 ` Szabolcs Nagy via Libc-alpha
2020-10-09 10:55 ` Florian Weimer via Libc-alpha
2020-10-09 11:03 ` Szabolcs Nagy via Libc-alpha
2020-10-08 23:16 ` Paul A. Clarke via Libc-alpha
2020-10-09 8:56 ` Florian Weimer via Libc-alpha
2020-10-09 13:19 ` Adhemerval Zanella via Libc-alpha
2020-10-12 11:54 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 17/28] x86_64: Add glibc-hwcaps support Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 18/28] powerpc64le: " Florian Weimer via Libc-alpha
2020-10-01 18:56 ` Paul A. Clarke via Libc-alpha
2020-10-05 9:47 ` Florian Weimer via Libc-alpha
2020-10-05 19:15 ` Paul A. Clarke via Libc-alpha
2020-10-06 12:20 ` Florian Weimer via Libc-alpha
2020-10-06 17:45 ` Paul A. Clarke via Libc-alpha
2020-10-09 9:06 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 19/28] s390x: Add " Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 20/28] aarch64: " Florian Weimer via Libc-alpha
2020-10-14 13:46 ` Adhemerval Zanella via Libc-alpha
2020-10-14 14:08 ` Florian Weimer via Libc-alpha
2020-10-14 14:15 ` Adhemerval Zanella via Libc-alpha
2020-10-14 14:37 ` Szabolcs Nagy via Libc-alpha
2020-10-14 14:43 ` Adhemerval Zanella via Libc-alpha
2020-10-14 15:13 ` Florian Weimer via Libc-alpha
2020-10-14 14:44 ` Florian Weimer via Libc-alpha
2020-10-14 15:09 ` Szabolcs Nagy via Libc-alpha
2020-10-01 16:33 ` [PATCH 21/28] elf: Add endianness markup to ld.so.cache Florian Weimer via Libc-alpha
2020-10-14 14:07 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` [PATCH 22/28] elf: Add extension mechanism " Florian Weimer via Libc-alpha
2020-10-15 17:52 ` Adhemerval Zanella via Libc-alpha
2020-10-30 12:22 ` Florian Weimer via Libc-alpha
2020-11-03 12:45 ` Adhemerval Zanella via Libc-alpha
2020-11-03 15:30 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 23/28] elf: Unify old and new format cache handling code in ld.so Florian Weimer via Libc-alpha
2020-10-16 14:37 ` Adhemerval Zanella via Libc-alpha
2020-10-30 13:22 ` Florian Weimer via Libc-alpha
2020-11-03 13:02 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:34 ` [PATCH 24/28] elf: Implement a string table for ldconfig, with tail merging Florian Weimer via Libc-alpha
2020-10-20 14:25 ` Adhemerval Zanella via Libc-alpha
2020-10-30 17:08 ` Florian Weimer via Libc-alpha
2020-11-03 13:05 ` Adhemerval Zanella via Libc-alpha
2020-11-03 15:29 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 25/28] elf: Implement tail merging of strings in ldconfig Florian Weimer via Libc-alpha
2020-10-22 21:08 ` Adhemerval Zanella via Libc-alpha
2020-10-30 17:36 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 26/28] elf: In ldconfig, extract the new_sub_entry function from search_dir Florian Weimer via Libc-alpha
2020-10-27 13:15 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:34 ` [PATCH 27/28] elf: Process glibc-hwcaps subdirectories in ldconfig Florian Weimer via Libc-alpha
2020-10-27 17:28 ` Adhemerval Zanella via Libc-alpha
2020-11-04 11:57 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 28/28] elf: Add glibc-hwcaps subdirectory support to ld.so cache processing Florian Weimer via Libc-alpha
2020-10-01 16:50 ` [PATCH 00/28] glibc-hwcaps support H.J. Lu via Libc-alpha
2020-10-01 16:54 ` Florian Weimer via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=615ab9ee-2313-587d-6f6f-8450752b889e@linaro.org \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).