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>

diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h
index 90f83ec24e556127562cb8817a1ea8a52e086156..a5264f9f2c810a17ee17126919bb139c2830ee29 100644 (file)
--- a/sysdeps/alpha/dl-procinfo.h
+++ b/sysdeps/alpha/dl-procinfo.h
@@ -21,9 +21,6 @@
 
 #include <ldsodefs.h>
 
-
-#define _DL_PLATFORMS_COUNT   5
-
 /* We cannot provide a general printing function.  */
 #define _dl_procinfo(type, word) -1
 

diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h
index 803441f52c0580cd7a9e1fda583814a15e5d147c..3e7c63ee67633ff78974d13d4e741f507e59e9a4 100644 (file)
--- a/sysdeps/csky/dl-procinfo.h
+++ b/sysdeps/csky/dl-procinfo.h
@@ -22,9 +22,6 @@
 
 #include <ldsodefs.h>
 
-
-#define _DL_PLATFORMS_COUNT   4
-
 /* We cannot provide a general printing function.  */
 #define _dl_procinfo(word, val) -1
 

diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h
index 7185542eac9e06061edcfc03d6bdff0684f67a5e..79c2acc3882a17e6d313a1f6cf8968272addf133 100644 (file)
--- a/sysdeps/mips/dl-procinfo.h
+++ b/sysdeps/mips/dl-procinfo.h
@@ -21,9 +21,6 @@
 
 #include <ldsodefs.h>
 
-
-#define _DL_PLATFORMS_COUNT   4
-
 /* We cannot provide a general printing function.  */
 #define _dl_procinfo(type, word) -1
 

diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
index 5b628a27cadc862fd0628c2dc627de9f9b5eb2b0..81eb9fba8750d5dba62d2d088529c27585415ccf 100644 (file)
--- a/sysdeps/powerpc/dl-procinfo.h
+++ b/sysdeps/powerpc/dl-procinfo.h
@@ -38,8 +38,6 @@
 #define HWCAP_IMPORTANT                (PPC_FEATURE_HAS_ALTIVEC \
                                + PPC_FEATURE_HAS_DFP)
 
-#define _DL_PLATFORMS_COUNT    17
-
 #define _DL_FIRST_PLATFORM     32
 
 /* Platform bits (relative to _DL_FIRST_PLATFORM).  */

diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index ef2a084ce704c3db8d9429b9af31af41b5a3d54a..7092ed1e2ddea95f3829ecfc09d2d67ee12af582 100644 (file)
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -23,8 +23,6 @@
 #define _DL_HWCAP_COUNT 23
 extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden;
 
-#define _DL_PLATFORMS_COUNT    11
-
 /* Hardware capability bit numbers are derived directly from the
    facility indications as stored by the "store facility list" (STFL)
    instruction.

diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h
index e14e755bd7cab0b040bb1ca6c47e6cc171a02ce6..246fdcd8316f13c66bbda0d8bf55467a0b286de3 100644 (file)
--- 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 165ffd89a96c37b686c4ded4775cf7f670114cac..b791fd3e92ba53f7611e82d3fbbebc61fce34d7e 100644 (file)
--- 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 a8d7d4ed328cc0815c4580c608fdc4db6c0eb14e..ea0f33bbad7adbbc092f91a7812500c8014989ed 100644 (file)
--- 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 */

diff --git a/sysdeps/x86_64/dl-procruntime.c b/sysdeps/x86_64/dl-procruntime.c
index 70785817781454f1711bba014ae54a8728c7aee9..0859438ed08f57b2fb39333636b8d8e70bde033e 100644 (file)
--- a/sysdeps/x86_64/dl-procruntime.c
+++ b/sysdeps/x86_64/dl-procruntime.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.