From patchwork Mon Jun 22 15:14:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39744 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 EBD25389853D; Mon, 22 Jun 2020 15:14:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBD25389853D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592838865; bh=iAFJqw7k4lFvpsiTapCFYWpSuIyl92UoV2RIKQXxNeE=; 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=Dppq8yUnXLH/y3upmGhJPzGlAJW9HibqVA0ub28Rur2U27ibZtd6fNJy8/4Gw/3jl fTdOvd7uGxdu35mL45IqYZ/jyyFAkgKdUBp3DbYWStBOaZJY2Bo9eHriL/26dJ7bCF pQHKOCJveyDS/a/QCVtFh9eKTifsLWkG6pfokG4o= 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 [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id CFC693938C0E for ; Mon, 22 Jun 2020 15:14:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CFC693938C0E 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-47-aiRkKDYrOcWpVfDcfZbuvQ-1; Mon, 22 Jun 2020 11:14:19 -0400 X-MC-Unique: aiRkKDYrOcWpVfDcfZbuvQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 321FE80F5E9 for ; Mon, 22 Jun 2020 15:14:10 +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 A473E2B4A6 for ; Mon, 22 Jun 2020 15:14:09 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 13/30] elf: Print the full name of the dynamic loader in the ld.so help message In-Reply-To: References: Message-Id: <01dfe71f8b07be2d2c0e6006eef0e320deea3c77.1592836143.git.fweimer@redhat.com> Date: Mon, 22 Jun 2020 17:14:08 +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.23 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, 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" This requires defining a macro for the full path, matching the -Wl,--dynamic-link= arguments used for linking glibc programs, and ldd script. --- elf/Makefile | 3 ++- elf/dl-usage.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/elf/Makefile b/elf/Makefile index 85f7e08e00..d2f58c8ce6 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -648,7 +648,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 0a12c631a6..5caf9794c6 100644 --- a/elf/dl-usage.c +++ b/elf/dl-usage.c @@ -75,6 +75,8 @@ setting environment variables (which would be inherted by subprocesses).\n\ --preload LIST preload objects named in LIST\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 (0);