From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 14/28] elf: Enhance ld.so --help to print HWCAP subdirectories
Date: Thu, 01 Oct 2020 18:33:03 +0200 [thread overview]
Message-ID: <b124245ba3070588a8b0d88b915ff9456b27a2d4.1601569371.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1601569371.git.fweimer@redhat.com>
---
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 <unistd.h>
#include "version.h"
+#include <dl-hwcaps.h>
+
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;
+ 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);
+ }
+ }
+}
+
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);
}
--
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill
next prev parent reply other threads:[~2020-10-01 16:33 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 16:31 [PATCH 00/28] glibc-hwcaps support Florian Weimer via Libc-alpha
2020-10-01 16:31 ` [PATCH 01/28] elf: Do not search HWCAP subdirectories in statically linked binaries Florian Weimer via Libc-alpha
2020-10-01 18:22 ` Adhemerval Zanella via Libc-alpha
2020-10-01 18:24 ` Carlos O'Donell via Libc-alpha
2020-10-01 18:29 ` Adhemerval Zanella via Libc-alpha
2020-10-01 20:24 ` Carlos O'Donell via Libc-alpha
2020-10-01 16:31 ` [PATCH 02/28] elf: Implement __rtld_malloc_is_full Florian Weimer via Libc-alpha
2020-10-01 18:23 ` Adhemerval Zanella via Libc-alpha
2020-10-08 9:44 ` Florian Weimer via Libc-alpha
2020-10-01 16:31 ` [PATCH 03/28] elf: Implement _dl_write Florian Weimer via Libc-alpha
2020-10-05 19:46 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:31 ` [PATCH 04/28] elf: Extract command-line/environment variables state from rtld.c Florian Weimer via Libc-alpha
2020-10-06 20:45 ` Adhemerval Zanella via Libc-alpha
2020-10-08 11:32 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 05/28] elf: Move ld.so error/help output to _dl_usage Florian Weimer via Libc-alpha
2020-10-06 21:06 ` Adhemerval Zanella via Libc-alpha
2020-10-08 12:19 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 06/28] elf: Record whether paths come from LD_LIBRARY_PATH or --library-path Florian Weimer via Libc-alpha
2020-10-07 16:39 ` Adhemerval Zanella via Libc-alpha
2020-10-07 16:49 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 07/28] elf: Implement ld.so --help Florian Weimer via Libc-alpha
2020-10-07 17:16 ` Adhemerval Zanella via Libc-alpha
2020-10-08 13:13 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 08/28] elf: Implement ld.so --version Florian Weimer via Libc-alpha
2020-10-07 18:36 ` Adhemerval Zanella via Libc-alpha
2020-10-07 18:38 ` Adhemerval Zanella via Libc-alpha
2020-10-08 13:37 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 09/28] scripts/update-copyrights: Update csu/version.c, elf/dl-usage.c Florian Weimer via Libc-alpha
2020-10-07 18:41 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 10/28] elf: Use the term "program interpreter" in the ld.so help message Florian Weimer via Libc-alpha
2020-10-07 21:08 ` Adhemerval Zanella via Libc-alpha
2020-10-08 14:08 ` Florian Weimer via Libc-alpha
2020-10-01 16:32 ` [PATCH 11/28] elf: Print the full name of the dynamic loader " Florian Weimer via Libc-alpha
2020-10-08 12:38 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 12/28] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables Florian Weimer via Libc-alpha
2020-10-08 13:27 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:32 ` [PATCH 13/28] elf: Add library search path information to ld.so --help Florian Weimer via Libc-alpha
2020-10-08 16:22 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` Florian Weimer via Libc-alpha [this message]
2020-10-08 16:27 ` [PATCH 14/28] elf: Enhance ld.so --help to print HWCAP subdirectories Adhemerval Zanella via Libc-alpha
2020-10-09 8:18 ` Florian Weimer via Libc-alpha
2020-10-09 13:49 ` Matheus Castanho via Libc-alpha
2020-10-09 17:08 ` Florian Weimer via Libc-alpha
2020-10-09 17:12 ` Florian Weimer via Libc-alpha
2020-10-09 18:54 ` Matheus Castanho via Libc-alpha
2020-10-12 9:47 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 15/28] elf: Do not pass GLRO(dl_platform), GLRO(dl_platformlen) to _dl_important_hwcaps Florian Weimer via Libc-alpha
2020-10-08 18:04 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` [PATCH 16/28] elf: Add glibc-hwcaps support for LD_LIBRARY_PATH Florian Weimer via Libc-alpha
2020-10-08 10:13 ` Szabolcs Nagy via Libc-alpha
2020-10-09 9:08 ` Florian Weimer via Libc-alpha
2020-10-09 10:50 ` Szabolcs Nagy via Libc-alpha
2020-10-09 10:55 ` Florian Weimer via Libc-alpha
2020-10-09 11:03 ` Szabolcs Nagy via Libc-alpha
2020-10-08 23:16 ` Paul A. Clarke via Libc-alpha
2020-10-09 8:56 ` Florian Weimer via Libc-alpha
2020-10-09 13:19 ` Adhemerval Zanella via Libc-alpha
2020-10-12 11:54 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 17/28] x86_64: Add glibc-hwcaps support Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 18/28] powerpc64le: " Florian Weimer via Libc-alpha
2020-10-01 18:56 ` Paul A. Clarke via Libc-alpha
2020-10-05 9:47 ` Florian Weimer via Libc-alpha
2020-10-05 19:15 ` Paul A. Clarke via Libc-alpha
2020-10-06 12:20 ` Florian Weimer via Libc-alpha
2020-10-06 17:45 ` Paul A. Clarke via Libc-alpha
2020-10-09 9:06 ` Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 19/28] s390x: Add " Florian Weimer via Libc-alpha
2020-10-01 16:33 ` [PATCH 20/28] aarch64: " Florian Weimer via Libc-alpha
2020-10-14 13:46 ` Adhemerval Zanella via Libc-alpha
2020-10-14 14:08 ` Florian Weimer via Libc-alpha
2020-10-14 14:15 ` Adhemerval Zanella via Libc-alpha
2020-10-14 14:37 ` Szabolcs Nagy via Libc-alpha
2020-10-14 14:43 ` Adhemerval Zanella via Libc-alpha
2020-10-14 15:13 ` Florian Weimer via Libc-alpha
2020-10-14 14:44 ` Florian Weimer via Libc-alpha
2020-10-14 15:09 ` Szabolcs Nagy via Libc-alpha
2020-10-01 16:33 ` [PATCH 21/28] elf: Add endianness markup to ld.so.cache Florian Weimer via Libc-alpha
2020-10-14 14:07 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:33 ` [PATCH 22/28] elf: Add extension mechanism " Florian Weimer via Libc-alpha
2020-10-15 17:52 ` Adhemerval Zanella via Libc-alpha
2020-10-30 12:22 ` Florian Weimer via Libc-alpha
2020-11-03 12:45 ` Adhemerval Zanella via Libc-alpha
2020-11-03 15:30 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 23/28] elf: Unify old and new format cache handling code in ld.so Florian Weimer via Libc-alpha
2020-10-16 14:37 ` Adhemerval Zanella via Libc-alpha
2020-10-30 13:22 ` Florian Weimer via Libc-alpha
2020-11-03 13:02 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:34 ` [PATCH 24/28] elf: Implement a string table for ldconfig, with tail merging Florian Weimer via Libc-alpha
2020-10-20 14:25 ` Adhemerval Zanella via Libc-alpha
2020-10-30 17:08 ` Florian Weimer via Libc-alpha
2020-11-03 13:05 ` Adhemerval Zanella via Libc-alpha
2020-11-03 15:29 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 25/28] elf: Implement tail merging of strings in ldconfig Florian Weimer via Libc-alpha
2020-10-22 21:08 ` Adhemerval Zanella via Libc-alpha
2020-10-30 17:36 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 26/28] elf: In ldconfig, extract the new_sub_entry function from search_dir Florian Weimer via Libc-alpha
2020-10-27 13:15 ` Adhemerval Zanella via Libc-alpha
2020-10-01 16:34 ` [PATCH 27/28] elf: Process glibc-hwcaps subdirectories in ldconfig Florian Weimer via Libc-alpha
2020-10-27 17:28 ` Adhemerval Zanella via Libc-alpha
2020-11-04 11:57 ` Florian Weimer via Libc-alpha
2020-10-01 16:34 ` [PATCH 28/28] elf: Add glibc-hwcaps subdirectory support to ld.so cache processing Florian Weimer via Libc-alpha
2020-10-01 16:50 ` [PATCH 00/28] glibc-hwcaps support H.J. Lu via Libc-alpha
2020-10-01 16:54 ` Florian Weimer via Libc-alpha
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b124245ba3070588a8b0d88b915ff9456b27a2d4.1601569371.git.fweimer@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=fweimer@redhat.com \
/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).