AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: Simplify output of hwcap subdirectories in ld.so help

Browse Source 
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>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Javier Pello 2022-09-27 20:10:08 +02:00 committed by Adhemerval Zanella
parent ab40f20364
commit e76369ed63
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
elf/dl-usage.c
View File

@ -104,34 +104,6 @@ print_search_path_for_help (struct dl_main_state *state)
print_search_path_for_help_1 (__rtld_search_dirs.dirs); 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. */ /* Print the header for print_hwcaps_subdirectories. */
static void static void
print_hwcaps_subdirectories_header (bool *nothing_printed) print_hwcaps_subdirectories_header (bool *nothing_printed)
@ -165,9 +137,7 @@ print_hwcaps_subdirectories (const struct dl_main_state *state)
{ {
print_hwcaps_subdirectories_header (&nothing_printed); print_hwcaps_subdirectories_header (&nothing_printed);
print_hwcaps_subdirectories_name (&split); print_hwcaps_subdirectories_name (&split);
bool first = true; _dl_printf (" (searched)\n");
print_hwcap_1 (&first, true, "searched");
print_hwcap_1_finish (&first);
} }
/* The built-in glibc-hwcaps subdirectories. Do the filtering /* 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 (&nothing_printed); print_hwcaps_subdirectories_header (&nothing_printed);
print_hwcaps_subdirectories_name (&split); print_hwcaps_subdirectories_name (&split);
bool first = true;
print_hwcap_1 (&first, mask & 1, "supported");
bool listed = _dl_hwcaps_contains (state->glibc_hwcaps_mask, bool listed = _dl_hwcaps_contains (state->glibc_hwcaps_mask,
split.segment, split.length); split.segment, split.length);
print_hwcap_1 (&first, !listed, "masked"); if (mask & 1)
print_hwcap_1 (&first, (mask & 1) && listed, "searched"); _dl_printf (" (supported, %s)\n", listed ? "searched" : "masked");
print_hwcap_1_finish (&first); else if (!listed)
_dl_printf (" (masked)\n");
else
_dl_printf ("\n");
mask >>= 1; mask >>= 1;
} }