From 343439a31ed1f07da307037b2c92b8ab3367c05c Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 7 Jun 2024 13:42:42 +0200 Subject: 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 --- sysdeps/x86/dl-hwcap.h | 10 ++-------- sysdeps/x86/dl-procinfo.c | 5 ++--- sysdeps/x86/dl-procinfo.h | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'sysdeps/x86') 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 . */ -/* 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 #define _DL_HWCAP_COUNT HWCAP_COUNT -#define _DL_PLATFORMS_COUNT HWCAP_PLATFORMS_COUNT #endif /* dl-procinfo.h */ -- cgit 1.4.1