From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id A2CD4384B838; Thu, 6 Oct 2022 11:03:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A2CD4384B838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665054188; bh=wQeQwBAJ7mXVkTymB46LuZHZIbyNGkkHbpdfvuAANlI=; h=From:To:Subject:Date:From; b=C4WrcR7oERytV1JIyeJ7ABQMn8CJUvlvZNWxheRb1zM4brxFSU4V8ciJNSaTtKU8o aZdmMQYDqXAf9iYqYSVtLcBR2WMLFhUug/NuUIDMttBnvSIwD8DonnZOh2EIJzPR0J JgD0hy370y5O2VnQah8spMUMk+Co8nic12nOA4sA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] elf: Simplify output of hwcap subdirectories in ld.so help X-Act-Checkin: glibc X-Git-Author: Javier Pello X-Git-Refname: refs/heads/master X-Git-Oldrev: ab40f20364f4a417a63dd51fdd943742070bfe96 X-Git-Newrev: e76369ed6371734f77f468eab097ef4e5b5db1c5 Message-Id: <20221006110308.A2CD4384B838@sourceware.org> Date: Thu, 6 Oct 2022 11:03:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e76369ed6371734f77f468eab097ef4e5b5db1c5 commit e76369ed6371734f77f468eab097ef4e5b5db1c5 Author: Javier Pello Date: Tue Sep 27 20:10:08 2022 +0200 elf: Simplify output of hwcap subdirectories in ld.so help 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 Reviewed-by: Adhemerval Zanella Diff: --- 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 efd6c77c25..754a6391bf 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; }