From patchwork Mon Jun 22 15:14:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39743 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 0DDBF3939C3D; Mon, 22 Jun 2020 15:14:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DDBF3939C3D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592838864; bh=AQY82kXNUvo4Vbo3wxVZJUj+bGW+YFx+x+qOZQ1G7U0=; 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=Xa+hZC5hqCsptURE+RxJIZ/PHQJYtbzcVGRYgqT75rFMBhT1GZBNWTrOqnGAN1/kQ gWQUFrzBhjaZySNE64fZRDwGfa3+l9VYU6vfS7ySRV78d+0jyJ19N2zOGJN3A9Q3V2 SQ3OpKFQX9lQmWXQLnqPIt/xBq52ZkK7oTmFGdgQ= 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 777B63890436 for ; Mon, 22 Jun 2020 15:14:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 777B63890436 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-90-Xz3cNPdXPOivuCGkQofbGw-1; Mon, 22 Jun 2020 11:14:17 -0400 X-MC-Unique: Xz3cNPdXPOivuCGkQofbGw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CDD61803818 for ; Mon, 22 Jun 2020 15:14:05 +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 51DE07167F for ; Mon, 22 Jun 2020 15:14:05 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 12/30] elf: Use the term "program interpreter" in the ld.so help message In-Reply-To: References: Message-Id: <1441e4457db61a8acb85751571c6a7578e392afe.1592836143.git.fweimer@redhat.com> Date: Mon, 22 Jun 2020 17:14:03 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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 c8d182c442..0a12c631a6 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\ \n\ --list list all dependencies and how they are resolved\n\ --verify verify that given object really is a dynamically linked\n\