From patchwork Mon Jun 22 15:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39739 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5A1C5389366F; Mon, 22 Jun 2020 15:14:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A1C5389366F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592838857; bh=gyIluNYtDdirHNHmJbLfWa3gNpAb3PPBf0sUmLjaUkk=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NG/nJKFt6aiWEsnbLRwfIPwqc4UqxfWVhZXCR7IUq1oH54nLb59H9Z+0Qvw3Ojwca e07MMZ67M9DIUUUgH9ckhV5hYWj1Y4i1+eemddP05YcF04daijq/NuNXlEb3kGMO4D wJYbwkMe6/s35GioZK+QbkqD3sp+URV79hQHxmls= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id D1CE3388F065 for ; Mon, 22 Jun 2020 15:14:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D1CE3388F065 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-XF0uI_qbO_Wm9T7s2_aNQw-1; Mon, 22 Jun 2020 11:14:09 -0400 X-MC-Unique: XF0uI_qbO_Wm9T7s2_aNQw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2B1818C78DC for ; Mon, 22 Jun 2020 15:13:42 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-185.ams2.redhat.com [10.36.112.185]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45B4110013D7 for ; Mon, 22 Jun 2020 15:13:42 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 07/30] elf: Move ld.so error/help output to _dl_usage In-Reply-To: References: Message-Id: Date: Mon, 22 Jun 2020 17:13:40 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Also add a comment to elf/Makefile, explaining why we cannot use config.status for autoconf template processing. --- elf/Makefile | 9 ++++++++- elf/dl-main.h | 5 +++++ elf/dl-usage.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ elf/rtld.c | 25 +------------------------ 4 files changed, 64 insertions(+), 25 deletions(-) create mode 100644 elf/dl-usage.c diff --git a/elf/Makefile b/elf/Makefile index b56fe0c0b7..85f7e08e00 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 @@ -605,6 +605,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' \ @@ -642,6 +648,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 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 #include +#include /* 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 */ diff --git a/elf/dl-usage.c b/elf/dl-usage.c new file mode 100644 index 0000000000..e03f183622 --- /dev/null +++ b/elf/dl-usage.c @@ -0,0 +1,50 @@ +/* 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 + . */ + +#include +#include +#include + +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"); +} diff --git a/elf/rtld.c b/elf/rtld.c index e3556eabc4..5fe6ca969a 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1216,30 +1216,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"); + _dl_usage (); ++_dl_skip_args; --_dl_argc;