[v3,7/8] elf: Remove _dl_string_hwcap
Checks
| Context |
Check |
Description |
| dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
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(-)
Comments
On 27/09/22 15:09, Javier Pello wrote:
> Removal of legacy hwcaps support from the dynamic loader left
> no users of _dl_string_hwcap.
>
> Signed-off-by: Javier Pello <devel@otheo.eu>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> 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
>
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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)
@@ -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)
@@ -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 \
@@ -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
@@ -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 */
@@ -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