From patchwork Tue Oct 17 14:50:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 78039 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 A6DDE3858431 for ; Tue, 17 Oct 2023 14:50:53 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 0474D3858C54 for ; Tue, 17 Oct 2023 14:50:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0474D3858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0474D3858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697554242; cv=none; b=Qkn1HVK6XExMsNY4mwnF3PSp/KHtsy+n4SOdSytK8lY82/8O0lLjbVh6d6VT9XLfibyA8RTMOkVzPjsRhHrw2B/6hoKjMt+i3ERaOGoJ98FE223ItzmUjSM7efcDl4L53nzAk7ieqP18RtBoEODQK0ilxnhvfYELYJy/e1o9PCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697554242; c=relaxed/simple; bh=NvERp6GKjTj/Vv3ZDkP8ZUrvvjAUOKsLaz/VdonxxM4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=WpwobDnZFQ1eYSG00PPQASoAfEN509HvvX3ZFQIJyv79J0FboTEiQbh3blHbTodlwSYgimqS2r9eDMjlsVAKRRuBIRJKojjuUJxZatgmavhxJHsvQ5jLgLTh3Wi/0NuCAv/aybRQlBHSBH7uvT8quKNMTB9nL9Q+yFObS8F+f90= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-27cfb8442f9so3594187a91.2 for ; Tue, 17 Oct 2023 07:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697554239; x=1698159039; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=zAps8FUZRhjcJ94P8s3NV+piNYDvh7mmasX5rEKanX4=; b=MjHbE3VI6tNb31QTx9qYWp6ecpJK0H/DD3o/OzML14k5uck5dSHbGPXFyEKpOF/I4c dBxgnmEYGpcYqr/GMESTLfWfeROkXO0Oglxzc0/y9RVOTU6bjC2BAMYuQz3ELt2BXO0D L5LHeLrP2hAQYnABMVL4QZcUnYOERD24gNf9oxAPZNvgLuoZexJ7ackvPqK1tkvF3nFE qHNS1Jkjsn5CL1yUj3eOLOKE13mvRybakRKGb2WICwsv382xJkDaGkELW3ckzJ3I77eE AVI/EukzUkIOK2JrIwyTM6i8HPv/oJWeDQLxm29vzXT1x6wxx4VjvWoDWEJd9cORAQUI sGbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697554239; x=1698159039; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zAps8FUZRhjcJ94P8s3NV+piNYDvh7mmasX5rEKanX4=; b=Snp3XgSjkAUaejlGOWytF9aEkwfGPS2+sGY98J1GoKQcLl8Yjr3oJA4/u49wQvXeHN U5ZFsjhe4B4QjbUUJPIajzsUmUfZp8tvc1QCkJbkqGIZN+vZhya1DxDANvuWsFP9E0fZ 46M1AWtR+APGfODgwP0A5Jrki0nDhLzSYFDsghxuLEFlRcHc5QzjNEBuWbj/ZOzzP0SW drYBJoo4VfcO3w/ZiUpnGExCVSq+Rkoa53uqWqFEM0gb+zXVAoi13vM15eTshF2E4vf/ GOuEhdFlrGT2NtKo0oGl4Wml47rrSeR5g3LDI+i3aj9jrFkNNTUuyLXvgccZOWa2lSZr AAJw== X-Gm-Message-State: AOJu0Yz0QwLcdVSxoFTDWKpXNgQfFlzOLXAjCAqcUFM9vPP0RF6tfECR qZcBAVpSbx5HivYyZKR6vi7rWlpzZhAb1VI2zg4= X-Google-Smtp-Source: AGHT+IHbwSyUUOTJkqycU5bauZPj839h/4jnKrxEyapAao2u6W1peWn5Rx/IBNVkr+BMtMaE8Ldtnw== X-Received: by 2002:a17:90b:5103:b0:27d:5946:5e2e with SMTP id sc3-20020a17090b510300b0027d59465e2emr2358874pjb.1.1697554239446; Tue, 17 Oct 2023 07:50:39 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7f2e:11d:92b4:4d78:4197]) by smtp.gmail.com with ESMTPSA id gz24-20020a17090b0ed800b0027cfb5f010dsm1421750pjb.4.2023.10.17.07.50.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:50:38 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] elf: Do not print the cache entry if --inhibit-cache is used Date: Tue, 17 Oct 2023 11:50:35 -0300 Message-Id: <20231017145035.3741202-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org So --help informs the correct shared library search path. Reviewed-by: Florian Weimer --- elf/dl-usage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elf/dl-usage.c b/elf/dl-usage.c index 98f0b0d027..04315451f2 100644 --- a/elf/dl-usage.c +++ b/elf/dl-usage.c @@ -99,7 +99,8 @@ print_search_path_for_help (struct dl_main_state *state) if (map != NULL) print_search_path_for_help_1 (map->l_runpath_dirs.dirs); - _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE); + if (!GLRO(dl_inhibit_cache)) + _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE); print_search_path_for_help_1 (__rtld_search_dirs.dirs); }