From: Javier Pello <devel@otheo.eu>
To: libc-alpha@sourceware.org
Subject: [PATCH 5/6] elf: Remove _dl_string_hwcap
Date: Wed, 14 Sep 2022 20:13:49 +0200 [thread overview]
Message-ID: <20220914201349.91854a089f70c804773abf45@otheo.eu> (raw)
In-Reply-To: <20220914200724.8e685fbbaf441c96d19011c6@otheo.eu>
Removal of legacy hwcaps support from the dynamic loader left
no users of _dl_string_hwcap.
Signed-off-by: Javier Pello <devel@otheo.eu>
---
sysdeps/alpha/dl-procinfo.h | 2 --
sysdeps/csky/dl-procinfo.h | 2 --
sysdeps/generic/dl-procinfo.h | 2 --
sysdeps/mips/dl-procinfo.h | 2 --
sysdeps/powerpc/dl-procinfo.h | 10 ----------
sysdeps/s390/dl-procinfo.h | 14 --------------
sysdeps/sparc/dl-procinfo.h | 13 -------------
sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 12 ------------
sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 12 ------------
sysdeps/x86/dl-hwcap.h | 14 --------------
10 files changed, 83 deletions(-)
diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h
index 31630fbb..6a12297d 100644
--- a/sysdeps/alpha/dl-procinfo.h
+++ b/sysdeps/alpha/dl-procinfo.h
@@ -54,6 +54,4 @@ _dl_string_platform (const char *str)
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
-#define _dl_string_hwcap(str) (-1)
-
#endif /* dl-procinfo.h */
diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h
index d29e19a9..5da90087 100644
--- a/sysdeps/csky/dl-procinfo.h
+++ b/sysdeps/csky/dl-procinfo.h
@@ -54,6 +54,4 @@ _dl_string_platform (const char *str)
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
-#define _dl_string_hwcap(str) (-1)
-
#endif /* dl-procinfo.h */
diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h
index 8f736e1d..033bcb3e 100644
--- a/sysdeps/generic/dl-procinfo.h
+++ b/sysdeps/generic/dl-procinfo.h
@@ -34,8 +34,6 @@
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
-#define _dl_string_hwcap(str) (-1)
-
#define _dl_string_platform(str) (-1)
#endif /* dl-procinfo.h */
diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h
index 619dc089..25127c36 100644
--- a/sysdeps/mips/dl-procinfo.h
+++ b/sysdeps/mips/dl-procinfo.h
@@ -54,6 +54,4 @@ _dl_string_platform (const char *str)
/* We don't have any hardware capabilities. */
#define _DL_HWCAP_COUNT 0
-#define _dl_string_hwcap(str) (-1)
-
#endif /* dl-procinfo.h */
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
index 6ed15610..a0b2d779 100644
--- a/sysdeps/powerpc/dl-procinfo.h
+++ b/sysdeps/powerpc/dl-procinfo.h
@@ -69,16 +69,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_powerpc_cap_flags)[idx];
}
-static inline int
-__attribute__ ((unused))
-_dl_string_hwcap (const char *str)
-{
- for (int i = 0; i < _DL_HWCAP_COUNT; ++i)
- if (strcmp (str, _dl_hwcap_string (i)) == 0)
- return i;
- return -1;
-}
-
static inline int
__attribute__ ((unused, always_inline))
_dl_string_platform (const char *str)
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index e1f88b9a..73aad1fd 100644
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -83,20 +83,6 @@ _dl_hwcap_string (int idx)
return _dl_s390_cap_flags[idx];
};
-static inline int
-__attribute__ ((unused, always_inline))
-_dl_string_hwcap (const char *str)
-{
- int i;
-
- for (i = 0; i < _DL_HWCAP_COUNT; i++)
- {
- if (strcmp (str, _dl_s390_cap_flags[i]) == 0)
- return i;
- }
- return -1;
-};
-
static inline int
__attribute__ ((unused, always_inline))
_dl_string_platform (const char *str)
diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h
index 4a723b53..fa095832 100644
--- a/sysdeps/sparc/dl-procinfo.h
+++ b/sysdeps/sparc/dl-procinfo.h
@@ -52,19 +52,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_sparc_cap_flags)[idx];
};
-static inline int
-__attribute__ ((unused, always_inline))
-_dl_string_hwcap (const char *str)
-{
- int i;
- for (i = 0; i < _DL_HWCAP_COUNT; i++)
- {
- if (strcmp (str, GLRO(dl_sparc_cap_flags) [i]) == 0)
- return i;
- }
- return -1;
-};
-
#include <bits/wordsize.h>
#define HWCAP_IMPORTANT_V9 (__WORDSIZE == 64 ? 0 : HWCAP_SPARC_V9)
#define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \
diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
index aa505223..f7382f63 100644
--- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
@@ -37,18 +37,6 @@ _dl_hwcap_string (int idx)
return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : "";
};
-static inline int
-__attribute__ ((unused))
-_dl_string_hwcap (const char *str)
-{
- for (int i = 0; i < _DL_HWCAP_COUNT; i++)
- {
- if (strcmp (str, _dl_hwcap_string (i)) == 0)
- return i;
- }
- return -1;
-};
-
/* There're no platforms to filter out. */
#define _DL_HWCAP_PLATFORM 0
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
index 1f4c8c3a..d8c0f262 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
@@ -75,18 +75,6 @@ _dl_procinfo (unsigned int type, unsigned long int word)
#define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON)
-static inline int
-__attribute__ ((unused))
-_dl_string_hwcap (const char *str)
-{
- for (int i = 0; i < _DL_HWCAP_COUNT; i++)
- {
- if (strcmp (str, _dl_hwcap_string (i)) == 0)
- return i;
- }
- return -1;
-};
-
#define _dl_string_platform(str) (-1)
#endif /* dl-procinfo.h */
diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h
index 26790afc..1313cecd 100644
--- a/sysdeps/x86/dl-hwcap.h
+++ b/sysdeps/x86/dl-hwcap.h
@@ -57,20 +57,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_x86_hwcap_flags)[idx];
};
-static inline int
-__attribute__ ((unused, always_inline))
-_dl_string_hwcap (const char *str)
-{
- int i;
-
- for (i = HWCAP_START; i < HWCAP_COUNT; i++)
- {
- if (strcmp (str, GLRO(dl_x86_hwcap_flags)[i]) == 0)
- return i;
- }
- return -1;
-};
-
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
--
2.36.0
next prev parent reply other threads:[~2022-09-14 18:15 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 ` Javier Pello [this message]
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
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=20220914201349.91854a089f70c804773abf45@otheo.eu \
--to=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).