diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2024-06-07 13:42:42 +0200 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2024-06-18 10:45:36 +0200 |
| commit | 343439a31ed1f07da307037b2c92b8ab3367c05c (patch) | |
| tree | c8b67fe6bf0a0591ed395f6df7021cde7063edbf /sysdeps/x86 | |
| parent | 43c7c5e62dbd7bf6c17f4688fb5f4990ae49e7fb (diff) | |
| download | glibc-343439a31ed1f07da307037b2c92b8ab3367c05c.tar.gz glibc-343439a31ed1f07da307037b2c92b8ab3367c05c.tar.xz glibc-343439a31ed1f07da307037b2c92b8ab3367c05c.zip | |
elf: Remove _DL_PLATFORMS_COUNT
Remove the definitions of _DL_PLATFORMS_COUNT as those are not used anymore after removal in elf/dl-cache.c:search_cache(). Note: On x86, we can also get rid of the definitions HWCAP_PLATFORMS_START and HWCAP_PLATFORMS_COUNT. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/x86')
| -rw-r--r-- | sysdeps/x86/dl-hwcap.h | 10 | ||||
| -rw-r--r-- | sysdeps/x86/dl-procinfo.c | 5 | ||||
| -rw-r--r-- | sysdeps/x86/dl-procinfo.h | 1 |
3 files changed, 4 insertions, 12 deletions
diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h index e14e755bd7..246fdcd831 100644 --- a/sysdeps/x86/dl-hwcap.h +++ b/sysdeps/x86/dl-hwcap.h @@ -20,20 +20,14 @@ #if IS_IN (ldconfig) /* Since ldconfig processes both i386 and x86-64 libraries, it needs - to cover all platforms and hardware capabilities. */ -# define HWCAP_PLATFORMS_START 0 -# define HWCAP_PLATFORMS_COUNT 4 + to cover all hardware capabilities. */ # define HWCAP_IMPORTANT \ (HWCAP_X86_SSE2 | HWCAP_X86_64 | HWCAP_X86_AVX512_1) #elif defined __x86_64__ -/* For 64 bit, only cover x86-64 platforms and capabilities. */ -# define HWCAP_PLATFORMS_START 2 -# define HWCAP_PLATFORMS_COUNT 4 +/* For 64 bit, only cover x86-64 capabilities. */ # define HWCAP_IMPORTANT (HWCAP_X86_64 | HWCAP_X86_AVX512_1) #else /* For 32 bit, only cover i586, i686 and SSE2. */ -# define HWCAP_PLATFORMS_START 0 -# define HWCAP_PLATFORMS_COUNT 2 # define HWCAP_IMPORTANT (HWCAP_X86_SSE2) #endif diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c index 165ffd89a9..b791fd3e92 100644 --- a/sysdeps/x86/dl-procinfo.c +++ b/sysdeps/x86/dl-procinfo.c @@ -16,9 +16,8 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -/* This information must be kept in sync with the _DL_HWCAP_COUNT, - HWCAP_PLATFORMS_START and HWCAP_PLATFORMS_COUNT definitions in - dl-hwcap.h. +/* This information must be kept in sync with the _DL_HWCAP_COUNT + definition in dl-hwcap.h. If anything should be added here check whether the size of each string is still ok with the given array size. diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h index a8d7d4ed32..ea0f33bbad 100644 --- a/sysdeps/x86/dl-procinfo.h +++ b/sysdeps/x86/dl-procinfo.h @@ -22,6 +22,5 @@ #include <dl-hwcap.h> #define _DL_HWCAP_COUNT HWCAP_COUNT -#define _DL_PLATFORMS_COUNT HWCAP_PLATFORMS_COUNT #endif /* dl-procinfo.h */ |