From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id A0FD5384B110 for ; Thu, 8 Oct 2020 16:27:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A0FD5384B110 Received: by mail-qk1-x744.google.com with SMTP id v123so7617965qkd.9 for ; Thu, 08 Oct 2020 09:27:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=dyBJcJjOA5UpcTy2emFIKWMx0U6NMwIeQhHvyAKBQl4=; b=aC+bkMz2o4J2djntNRaOljgHEIRnzcKD6yzfb+TlvGZO18kG2OivwDd3zaFbQytnm4 nsjEBrBbTz1nSukfyuMjRSkUMhMUkxVWWWnhPUqngAj/UMTkAg4/lBALbY+kGBzDN7Oj cCiUfGFxywmC7uSoUnCYcuVw972LbkKUgcUKI4hYgGpdXQfG1h6img2WHcpBwPqCpsrV XpJZjGn6bMFUQ0m24qq8dqbbtXHHuwfwd2bc+g83OsZykoVckUkhJTdhAnG9bHWEQjjX DVMdNtfg07FgooJxIznXlOo6/asvesTIf6qAOk+8yT/CNZzAE197F/myrJB4R13jo/oP D0zA== X-Gm-Message-State: AOAM531PW2QdJBh0MK6DzTwQJ2SahZzacjDxCKDZKXMF+ZIHlzp3yzlK w9RnjyOpzTwyPaHbFRInwtTAU9o2uh7VNw== X-Google-Smtp-Source: ABdhPJzDQM2EejDKkOE+iV5pQ0JcXbSvVRNciifRUo7iTKpcYMUiT3WOYOiu4eZjcNzEemdbn6lpQw== X-Received: by 2002:a37:6313:: with SMTP id x19mr9121101qkb.129.1602174446981; Thu, 08 Oct 2020 09:27:26 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p69sm4021051qka.5.2020.10.08.09.27.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Oct 2020 09:27:26 -0700 (PDT) Subject: Re: [PATCH 14/28] elf: Enhance ld.so --help to print HWCAP subdirectories To: libc-alpha@sourceware.org References: From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <0df1f307-c122-7ba2-9c3c-14bec8d506c4@linaro.org> Date: Thu, 8 Oct 2020 13:27:24 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Thu, 08 Oct 2020 16:27:29 -0000 LGTM, thanks. Reviewed-by: Adhemerval Zanella On 01/10/2020 13:33, Florian Weimer via Libc-alpha wrote: > --- > elf/dl-usage.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/elf/dl-usage.c b/elf/dl-usage.c > index 20aa715cb1..9765d1b5c1 100644 > --- a/elf/dl-usage.c > +++ b/elf/dl-usage.c > @@ -22,6 +22,8 @@ > #include > #include "version.h" > > +#include > + > void > _dl_usage (const char *argv0, const char *wrong_option) > { > @@ -101,6 +103,65 @@ print_search_path_for_help (struct dl_main_state *state) > print_search_path_for_help_1 (__rtld_search_dirs.dirs); > } > > +/* Helper function for printing flags associated with a HWCAP name. */ > +static void > +print_hwcap_1 (bool *first, bool active, const char *label) > +{ > + if (active) > + { > + if (*first) > + { > + _dl_printf (" ("); > + *first = false; > + } > + else > + _dl_printf (", "); > + _dl_printf ("%s", label); > + } > +} > + > +/* Called after a series of print_hwcap_1 calls to emit the line > + terminator. */ > +static void > +print_hwcap_1_finish (bool *first) > +{ > + if (*first) > + _dl_printf ("\n"); > + else > + _dl_printf (")\n"); > +} > + > +/* Write a list of hwcap subdirectories to standard output. See > + _dl_important_hwcaps in dl-hwcaps.c. */ > +static void > +print_legacy_hwcap_directories (void) > +{ > + _dl_printf ("\n\ > +Legacy HWCAP subdirectories under library search path directories:\n"); > + > + const char *platform = GLRO (dl_platform); > + if (platform != NULL) > + _dl_printf (" %s (AT_PLATFORM)\n", platform); > + > + _dl_printf (" tls (supported, searched)\n"); > + > + uint64_t hwcap_mask = GET_HWCAP_MASK(); > + uint64_t searched = GLRO (dl_hwcap) & hwcap_mask; > + for (int n = 63; n >= 0; --n) > + { > + uint64_t bit = 1ULL << n; UINT64_C(1) maybe? > + if (HWCAP_IMPORTANT & bit) > + { > + _dl_printf (" %s", _dl_hwcap_string (n)); > + bool first = true; > + print_hwcap_1 (&first, GLRO (dl_hwcap) & bit, "supported"); > + print_hwcap_1 (&first, !(hwcap_mask & bit), "masked"); > + print_hwcap_1 (&first, searched & bit, "searched"); > + print_hwcap_1_finish (&first); > + } > + } > +} > + Ok. > void > _dl_help (const char *argv0, struct dl_main_state *state) > { > @@ -136,5 +197,6 @@ This program interpreter self-identifies as: " RTLD "\n\ > ", > argv0); > print_search_path_for_help (state); > + print_legacy_hwcap_directories (); > _exit (0); > } > Ok.