From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Javier Pello <devel@otheo.eu>, libc-alpha@sourceware.org
Subject: Re: [PATCH v3 8/8] elf: Simplify output of hwcap subdirectories in ld.so help
Date: Mon, 3 Oct 2022 14:02:13 -0300 [thread overview]
Message-ID: <006b321e-8003-5489-92af-1db7cadf3608@linaro.org> (raw)
In-Reply-To: <20220927201008.ee65c40e3703598164e60dff@otheo.eu>
On 27/09/22 15:10, Javier Pello wrote:
> The print_hwcap_1 machinery was useful for the legacy hwcaps
> subdirectories, but it is not worth the trouble now that they
> are gone.
>
> Signed-off-by: Javier Pello <devel@otheo.eu>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> elf/dl-usage.c | 43 +++++++------------------------------------
> 1 file changed, 7 insertions(+), 36 deletions(-)
>
> diff --git a/elf/dl-usage.c b/elf/dl-usage.c
> index efd6c77c..754a6391 100644
> --- a/elf/dl-usage.c
> +++ b/elf/dl-usage.c
> @@ -104,34 +104,6 @@ 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");
> -}
> -
> /* Print the header for print_hwcaps_subdirectories. */
> static void
> print_hwcaps_subdirectories_header (bool *nothing_printed)
> @@ -165,9 +137,7 @@ print_hwcaps_subdirectories (const struct dl_main_state *state)
> {
> print_hwcaps_subdirectories_header (¬hing_printed);
> print_hwcaps_subdirectories_name (&split);
> - bool first = true;
> - print_hwcap_1 (&first, true, "searched");
> - print_hwcap_1_finish (&first);
> + _dl_printf (" (searched)\n");
> }
>
> /* The built-in glibc-hwcaps subdirectories. Do the filtering
> @@ -178,13 +148,14 @@ print_hwcaps_subdirectories (const struct dl_main_state *state)
> {
> print_hwcaps_subdirectories_header (¬hing_printed);
> print_hwcaps_subdirectories_name (&split);
> - bool first = true;
> - print_hwcap_1 (&first, mask & 1, "supported");
> bool listed = _dl_hwcaps_contains (state->glibc_hwcaps_mask,
> split.segment, split.length);
> - print_hwcap_1 (&first, !listed, "masked");
> - print_hwcap_1 (&first, (mask & 1) && listed, "searched");
> - print_hwcap_1_finish (&first);
> + if (mask & 1)
> + _dl_printf (" (supported, %s)\n", listed ? "searched" : "masked");
> + else if (!listed)
> + _dl_printf (" (masked)\n");
> + else
> + _dl_printf ("\n");
> mask >>= 1;
> }
>
prev parent reply other threads:[~2022-10-03 17:02 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 18:06 [PATCH 0/4] elf: Fix hwcaps string size overestimation Javier Pello
2022-09-05 18:09 ` [PATCH 1/4] " Javier Pello
2022-09-08 10:15 ` Florian Weimer
2022-09-05 18:10 ` [PATCH 2/4] elf: Simplify hwcaps masked value bit counting Javier Pello
2022-09-05 18:12 ` [PATCH 3/4] elf: Remove unneeded conditional in _dl_important_hwcaps Javier Pello
2022-09-05 18:13 ` [PATCH 4/4] elf: Simplify hwcaps power set string construction Javier Pello
2022-09-06 7:35 ` [PATCH 0/4] elf: Fix hwcaps string size overestimation Florian Weimer
2022-09-06 18:12 ` Javier Pello
2022-09-08 11:23 ` Florian Weimer
2022-09-14 18:07 ` [PATCH 0/6] Remove legacy hwcaps support Javier Pello
2022-09-14 18:08 ` [PATCH 1/6] elf: Remove legacy hwcaps support from the dynamic loader Javier Pello
2022-09-14 18:10 ` [PATCH 2/6] elf: Remove legacy hwcaps support from ldconfig Javier Pello
2022-09-14 18:10 ` [PATCH 3/6] elf: Remove hwcap parameter from add_to_cache signature Javier Pello
2022-09-14 18:12 ` [PATCH 4/6] elf: Remove hwcap and bits_hwcap fields from struct cache_entry Javier Pello
2022-09-14 18:13 ` [PATCH 5/6] elf: Remove _dl_string_hwcap Javier Pello
2022-09-14 18:15 ` [PATCH 6/6] elf: Simplify output of hwcap subdirectories in ld.so help Javier Pello
2022-09-15 8:42 ` Carlos O'Donell
2022-09-15 19:12 ` Javier Pello
2022-09-14 21:23 ` [PATCH 0/6] Remove legacy hwcaps support Joseph Myers
2022-09-17 14:17 ` [PATCH v2 " Javier Pello
2022-09-17 14:18 ` [PATCH v2 1/6] elf: Remove legacy hwcaps support from the dynamic loader Javier Pello
2022-09-22 11:46 ` Florian Weimer
2022-09-17 14:19 ` [PATCH v2 2/6] elf: Remove legacy hwcaps support from ldconfig Javier Pello
2022-09-22 12:14 ` Florian Weimer
2022-09-17 14:20 ` [PATCH v2 3/6] elf: Remove hwcap parameter from add_to_cache signature Javier Pello
2022-09-22 16:02 ` Florian Weimer
2022-09-17 14:22 ` [PATCH v2 4/6] elf: Remove hwcap and bits_hwcap fields from struct cache_entry Javier Pello
2022-09-22 16:03 ` Florian Weimer
2022-09-17 14:23 ` [PATCH v2 5/6] elf: Remove _dl_string_hwcap Javier Pello
2022-09-17 14:24 ` [PATCH v2 6/6] elf: Simplify output of hwcap subdirectories in ld.so help Javier Pello
2022-09-21 16:26 ` [PATCH v2 0/6] Remove legacy hwcaps support Joseph Myers
2022-09-27 18:03 ` [PATCH v3 0/8] " Javier Pello
2022-09-27 18:05 ` [PATCH v3 1/8] x86_64: Remove platform directory library loading test Javier Pello
2022-10-03 14:56 ` Adhemerval Zanella Netto
2022-10-04 17:53 ` Javier Pello
2022-10-04 17:59 ` Adhemerval Zanella Netto
2022-09-27 18:05 ` [PATCH v3 2/8] elf: Remove legacy hwcaps support from the dynamic loader Javier Pello
2022-09-27 18:06 ` [PATCH v3 3/8] elf: Remove legacy hwcaps support from ldconfig Javier Pello
2022-10-03 15:31 ` Adhemerval Zanella Netto
2022-09-27 18:07 ` [PATCH v3 4/8] elf: Remove hwcap parameter from add_to_cache signature Javier Pello
2022-09-27 18:08 ` [PATCH v3 5/8] elf: Remove hwcap and bits_hwcap fields from struct cache_entry Javier Pello
2022-09-27 18:08 ` [PATCH v3 6/8] Add NEWS entry for legacy hwcaps removal Javier Pello
2022-10-03 15:44 ` Adhemerval Zanella Netto
2022-10-03 19:29 ` Andreas Schwab
2022-10-03 19:49 ` Adhemerval Zanella Netto
2022-10-03 19:59 ` Florian Weimer
2022-10-04 18:00 ` Adhemerval Zanella Netto
2022-10-05 18:12 ` Javier Pello
2022-10-06 11:03 ` Adhemerval Zanella Netto
2022-09-27 18:09 ` [PATCH v3 7/8] elf: Remove _dl_string_hwcap Javier Pello
2022-10-03 16:52 ` Adhemerval Zanella Netto
2022-09-27 18:10 ` [PATCH v3 8/8] elf: Simplify output of hwcap subdirectories in ld.so help Javier Pello
2022-10-03 17:02 ` Adhemerval Zanella Netto [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=006b321e-8003-5489-92af-1db7cadf3608@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=devel@otheo.eu \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).