diff options
author | Stefan Liebler <stli@linux.ibm.com> | 2024-06-07 13:42:38 +0200 |
---|---|---|
committer | Stefan Liebler <stli@linux.ibm.com> | 2024-06-18 10:45:36 +0200 |
commit | 8faada830227aeb1a17117cbf8b94d9be0f5ffe1 (patch) | |
tree | e1ff447f451f1d1710cd0e62f5190c0280aaeb45 | |
parent | c5aa5fd40adc81c4f0b18e01f329aeaf86518c7b (diff) | |
download | glibc-8faada830227aeb1a17117cbf8b94d9be0f5ffe1.zip glibc-8faada830227aeb1a17117cbf8b94d9be0f5ffe1.tar.gz glibc-8faada830227aeb1a17117cbf8b94d9be0f5ffe1.tar.bz2 |
elf: Remove _dl_string_platform
Despite of powerpc where the returned integer is stored in tcb,
and the diagnostics output, there is no user anymore.
Thus this patch removes the diagnostics output and
_dl_string_platform for all other platforms.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r-- | elf/dl-diagnostics.c | 2 | ||||
-rw-r--r-- | sysdeps/alpha/dl-procinfo.h | 15 | ||||
-rw-r--r-- | sysdeps/csky/dl-procinfo.h | 15 | ||||
-rw-r--r-- | sysdeps/generic/dl-procinfo.h | 2 | ||||
-rw-r--r-- | sysdeps/mips/dl-procinfo.h | 15 | ||||
-rw-r--r-- | sysdeps/s390/dl-procinfo.h | 15 | ||||
-rw-r--r-- | sysdeps/sparc/dl-procinfo.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 | ||||
-rw-r--r-- | sysdeps/x86/dl-procinfo.h | 15 |
10 files changed, 0 insertions, 85 deletions
diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c index aaf67b8..e69463b 100644 --- a/elf/dl-diagnostics.c +++ b/elf/dl-diagnostics.c @@ -245,8 +245,6 @@ _dl_print_diagnostics (char **environ) _dl_diagnostics_print_labeled_string ("dl_platform", GLRO (dl_platform)); _dl_diagnostics_print_labeled_string ("dl_profile_output", GLRO (dl_profile_output)); - _dl_diagnostics_print_labeled_value - ("dl_string_platform", _dl_string_platform ( GLRO (dl_platform))); _dl_diagnostics_print_labeled_string ("dso.ld", LD_SO); _dl_diagnostics_print_labeled_string ("dso.libc", LIBC_SO); diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h index f1e2e98..bc4db86 100644 --- a/sysdeps/alpha/dl-procinfo.h +++ b/sysdeps/alpha/dl-procinfo.h @@ -27,21 +27,6 @@ #define _DL_PLATFORMS_COUNT 5 -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_platform (const char *str) -{ - int i; - - if (str != NULL) - for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) - { - if (strcmp (str, GLRO(dl_alpha_platforms)[i]) == 0) - return i; - } - return -1; -}; - /* 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 77621e4..a54e8de 100644 --- a/sysdeps/csky/dl-procinfo.h +++ b/sysdeps/csky/dl-procinfo.h @@ -27,21 +27,6 @@ #define _DL_PLATFORMS_COUNT 4 -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_platform (const char *str) -{ - int i; - - if (str != NULL) - for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) - { - if (strcmp (str, GLRO(dl_csky_platforms)[i]) == 0) - return i; - } - return -1; -}; - /* We cannot provide a general printing function. */ #define _dl_procinfo(word, val) -1 diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index c481849..00e1ae7 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -34,6 +34,4 @@ /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 -#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 6655e68..3199434 100644 --- a/sysdeps/mips/dl-procinfo.h +++ b/sysdeps/mips/dl-procinfo.h @@ -27,21 +27,6 @@ #define _DL_PLATFORMS_COUNT 4 -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_platform (const char *str) -{ - int i; - - if (str != NULL) - for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) - { - if (strcmp (str, GLRO(dl_mips_platforms)[i]) == 0) - return i; - } - return -1; -}; - /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 38e77f7..ffeb655 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -83,19 +83,4 @@ _dl_hwcap_string (int idx) return _dl_s390_cap_flags[idx]; }; -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_platform (const char *str) -{ - int i; - - if (str != NULL) - for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) - { - if (strcmp (str, _dl_s390_platforms[i]) == 0) - return _DL_FIRST_PLATFORM + i; - } - return -1; -}; - #endif /* dl-procinfo.h */ diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index 61cd296..dbb1a4d 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -60,6 +60,4 @@ _dl_hwcap_string (int idx) /* There're no platforms to filter out. */ #define _DL_HWCAP_PLATFORM 0 -#define _dl_string_platform(str) (-1) - #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 6a3fb78..0ed89c5 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -40,6 +40,4 @@ _dl_hwcap_string (int idx) /* There're no platforms to filter out. */ #define _DL_HWCAP_PLATFORM 0 -#define _dl_string_platform(str) (-1) - #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 49cf000..2a1c598 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -75,6 +75,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) #define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON) -#define _dl_string_platform(str) (-1) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h index 3902925..b2184b8 100644 --- a/sysdeps/x86/dl-procinfo.h +++ b/sysdeps/x86/dl-procinfo.h @@ -30,19 +30,4 @@ #define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ << _DL_FIRST_PLATFORM) -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_platform (const char *str) -{ - int i; - - if (str != NULL) - for (i = HWCAP_PLATFORMS_START; i < HWCAP_PLATFORMS_COUNT; ++i) - { - if (strcmp (str, GLRO(dl_x86_platforms)[i]) == 0) - return _DL_FIRST_PLATFORM + i; - } - return -1; -}; - #endif /* dl-procinfo.h */ |