| Message ID | 20240607114543.659306-6-stli@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove legacy platform bits and cleanups | expand |
On 07/06/24 08:42, Stefan Liebler wrote: > Remove the definitions of _DL_HWCAP_PLATFORM as those are not used > anymore after removal in elf/dl-cache.c:search_cache(). LGTM, thanks Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/alpha/dl-procinfo.h | 3 --- > sysdeps/csky/dl-procinfo.h | 2 -- > sysdeps/generic/dl-procinfo.h | 3 --- > sysdeps/mips/dl-procinfo.h | 3 --- > sysdeps/powerpc/dl-procinfo.h | 3 --- > sysdeps/s390/dl-procinfo.h | 3 --- > sysdeps/sparc/dl-procinfo.h | 3 --- > sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 3 --- > sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 3 --- > sysdeps/x86/dl-procinfo.h | 3 --- > 10 files changed, 29 deletions(-) > > diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h > index bc4db868a9..90f83ec24e 100644 > --- a/sysdeps/alpha/dl-procinfo.h > +++ b/sysdeps/alpha/dl-procinfo.h > @@ -22,9 +22,6 @@ > #include <ldsodefs.h> > > > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (-1ULL) > - > #define _DL_PLATFORMS_COUNT 5 > > /* We cannot provide a general printing function. */ > diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h > index a54e8de446..803441f52c 100644 > --- a/sysdeps/csky/dl-procinfo.h > +++ b/sysdeps/csky/dl-procinfo.h > @@ -22,8 +22,6 @@ > > #include <ldsodefs.h> > > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (-1ULL) > > #define _DL_PLATFORMS_COUNT 4 > > diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h > index 00e1ae7b2f..1778fd1057 100644 > --- a/sysdeps/generic/dl-procinfo.h > +++ b/sysdeps/generic/dl-procinfo.h > @@ -28,9 +28,6 @@ > /* By default there is no important hardware capability. */ > #define HWCAP_IMPORTANT (0) > > -/* There're no platforms to filter out. */ > -#define _DL_HWCAP_PLATFORM 0 > - > /* We don't have any hardware capabilities. */ > #define _DL_HWCAP_COUNT 0 > > diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h > index 3199434390..7185542eac 100644 > --- a/sysdeps/mips/dl-procinfo.h > +++ b/sysdeps/mips/dl-procinfo.h > @@ -22,9 +22,6 @@ > #include <ldsodefs.h> > > > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (-1ULL) > - > #define _DL_PLATFORMS_COUNT 4 > > /* We cannot provide a general printing function. */ > diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h > index b36697ba44..5b628a27ca 100644 > --- a/sysdeps/powerpc/dl-procinfo.h > +++ b/sysdeps/powerpc/dl-procinfo.h > @@ -41,9 +41,6 @@ > #define _DL_PLATFORMS_COUNT 17 > > #define _DL_FIRST_PLATFORM 32 > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ > - << _DL_FIRST_PLATFORM) > > /* Platform bits (relative to _DL_FIRST_PLATFORM). */ > #define PPC_PLATFORM_POWER4 0 > diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h > index 63c9889f94..bb5f9c7863 100644 > --- a/sysdeps/s390/dl-procinfo.h > +++ b/sysdeps/s390/dl-procinfo.h > @@ -27,9 +27,6 @@ extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden; > > /* The kernel provides up to 32 capability bits with elf_hwcap. */ > #define _DL_FIRST_PLATFORM 32 > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ > - << _DL_FIRST_PLATFORM) > > /* Hardware capability bit numbers are derived directly from the > facility indications as stored by the "store facility list" (STFL) > diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h > index dbb1a4d324..bd1cb65596 100644 > --- a/sysdeps/sparc/dl-procinfo.h > +++ b/sysdeps/sparc/dl-procinfo.h > @@ -57,7 +57,4 @@ _dl_hwcap_string (int idx) > #define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \ > | HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2) > > -/* There're no platforms to filter out. */ > -#define _DL_HWCAP_PLATFORM 0 > - > #endif /* dl-procinfo.h */ > diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h > index 0ed89c5e41..17893a5225 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h > +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h > @@ -37,7 +37,4 @@ _dl_hwcap_string (int idx) > return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : ""; > }; > > -/* There're no platforms to filter out. */ > -#define _DL_HWCAP_PLATFORM 0 > - > #endif /* dl-procinfo.h */ > diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h > index 2a1c5985ee..85422b8edd 100644 > --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h > +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h > @@ -30,9 +30,6 @@ > /* Low 7 bits are allocated in HWCAP2. */ > #define _DL_HWCAP2_LAST 6 > > -/* The kernel provides platform data but it is not interesting. */ > -#define _DL_HWCAP_PLATFORM 0 > - > > static inline const char * > __attribute__ ((unused)) > diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h > index b2184b8f5d..1aa6bad67a 100644 > --- a/sysdeps/x86/dl-procinfo.h > +++ b/sysdeps/x86/dl-procinfo.h > @@ -26,8 +26,5 @@ > > /* Start at 48 to reserve spaces for hardware capabilities. */ > #define _DL_FIRST_PLATFORM 48 > -/* Mask to filter out platforms. */ > -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ > - << _DL_FIRST_PLATFORM) > > #endif /* dl-procinfo.h */
diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h index bc4db868a9..90f83ec24e 100644 --- a/sysdeps/alpha/dl-procinfo.h +++ b/sysdeps/alpha/dl-procinfo.h @@ -22,9 +22,6 @@ #include <ldsodefs.h> -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) - #define _DL_PLATFORMS_COUNT 5 /* We cannot provide a general printing function. */ diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h index a54e8de446..803441f52c 100644 --- a/sysdeps/csky/dl-procinfo.h +++ b/sysdeps/csky/dl-procinfo.h @@ -22,8 +22,6 @@ #include <ldsodefs.h> -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) #define _DL_PLATFORMS_COUNT 4 diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 00e1ae7b2f..1778fd1057 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -28,9 +28,6 @@ /* By default there is no important hardware capability. */ #define HWCAP_IMPORTANT (0) -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 0 - /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h index 3199434390..7185542eac 100644 --- a/sysdeps/mips/dl-procinfo.h +++ b/sysdeps/mips/dl-procinfo.h @@ -22,9 +22,6 @@ #include <ldsodefs.h> -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) - #define _DL_PLATFORMS_COUNT 4 /* We cannot provide a general printing function. */ diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index b36697ba44..5b628a27ca 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -41,9 +41,6 @@ #define _DL_PLATFORMS_COUNT 17 #define _DL_FIRST_PLATFORM 32 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) /* Platform bits (relative to _DL_FIRST_PLATFORM). */ #define PPC_PLATFORM_POWER4 0 diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 63c9889f94..bb5f9c7863 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -27,9 +27,6 @@ extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden; /* The kernel provides up to 32 capability bits with elf_hwcap. */ #define _DL_FIRST_PLATFORM 32 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) /* Hardware capability bit numbers are derived directly from the facility indications as stored by the "store facility list" (STFL) diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index dbb1a4d324..bd1cb65596 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -57,7 +57,4 @@ _dl_hwcap_string (int idx) #define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \ | HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2) -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 0 - #endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h index 0ed89c5e41..17893a5225 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -37,7 +37,4 @@ _dl_hwcap_string (int idx) return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : ""; }; -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 0 - #endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 2a1c5985ee..85422b8edd 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -30,9 +30,6 @@ /* Low 7 bits are allocated in HWCAP2. */ #define _DL_HWCAP2_LAST 6 -/* The kernel provides platform data but it is not interesting. */ -#define _DL_HWCAP_PLATFORM 0 - static inline const char * __attribute__ ((unused)) diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h index b2184b8f5d..1aa6bad67a 100644 --- a/sysdeps/x86/dl-procinfo.h +++ b/sysdeps/x86/dl-procinfo.h @@ -26,8 +26,5 @@ /* Start at 48 to reserve spaces for hardware capabilities. */ #define _DL_FIRST_PLATFORM 48 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) #endif /* dl-procinfo.h */