mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 14:00:30 +00:00
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>
This commit is contained in:
parent
c5aa5fd40a
commit
8faada8302
@ -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_platform", GLRO (dl_platform));
|
||||||
_dl_diagnostics_print_labeled_string
|
_dl_diagnostics_print_labeled_string
|
||||||
("dl_profile_output", GLRO (dl_profile_output));
|
("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.ld", LD_SO);
|
||||||
_dl_diagnostics_print_labeled_string ("dso.libc", LIBC_SO);
|
_dl_diagnostics_print_labeled_string ("dso.libc", LIBC_SO);
|
||||||
|
@ -27,21 +27,6 @@
|
|||||||
|
|
||||||
#define _DL_PLATFORMS_COUNT 5
|
#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. */
|
/* We cannot provide a general printing function. */
|
||||||
#define _dl_procinfo(type, word) -1
|
#define _dl_procinfo(type, word) -1
|
||||||
|
|
||||||
|
@ -27,21 +27,6 @@
|
|||||||
|
|
||||||
#define _DL_PLATFORMS_COUNT 4
|
#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. */
|
/* We cannot provide a general printing function. */
|
||||||
#define _dl_procinfo(word, val) -1
|
#define _dl_procinfo(word, val) -1
|
||||||
|
|
||||||
|
@ -34,6 +34,4 @@
|
|||||||
/* We don't have any hardware capabilities. */
|
/* We don't have any hardware capabilities. */
|
||||||
#define _DL_HWCAP_COUNT 0
|
#define _DL_HWCAP_COUNT 0
|
||||||
|
|
||||||
#define _dl_string_platform(str) (-1)
|
|
||||||
|
|
||||||
#endif /* dl-procinfo.h */
|
#endif /* dl-procinfo.h */
|
||||||
|
@ -27,21 +27,6 @@
|
|||||||
|
|
||||||
#define _DL_PLATFORMS_COUNT 4
|
#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. */
|
/* We cannot provide a general printing function. */
|
||||||
#define _dl_procinfo(type, word) -1
|
#define _dl_procinfo(type, word) -1
|
||||||
|
|
||||||
|
@ -83,19 +83,4 @@ _dl_hwcap_string (int idx)
|
|||||||
return _dl_s390_cap_flags[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 */
|
#endif /* dl-procinfo.h */
|
||||||
|
@ -60,6 +60,4 @@ _dl_hwcap_string (int idx)
|
|||||||
/* There're no platforms to filter out. */
|
/* There're no platforms to filter out. */
|
||||||
#define _DL_HWCAP_PLATFORM 0
|
#define _DL_HWCAP_PLATFORM 0
|
||||||
|
|
||||||
#define _dl_string_platform(str) (-1)
|
|
||||||
|
|
||||||
#endif /* dl-procinfo.h */
|
#endif /* dl-procinfo.h */
|
||||||
|
@ -40,6 +40,4 @@ _dl_hwcap_string (int idx)
|
|||||||
/* There're no platforms to filter out. */
|
/* There're no platforms to filter out. */
|
||||||
#define _DL_HWCAP_PLATFORM 0
|
#define _DL_HWCAP_PLATFORM 0
|
||||||
|
|
||||||
#define _dl_string_platform(str) (-1)
|
|
||||||
|
|
||||||
#endif /* dl-procinfo.h */
|
#endif /* 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 HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON)
|
||||||
|
|
||||||
#define _dl_string_platform(str) (-1)
|
|
||||||
|
|
||||||
#endif /* dl-procinfo.h */
|
#endif /* dl-procinfo.h */
|
||||||
|
@ -30,19 +30,4 @@
|
|||||||
#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \
|
#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \
|
||||||
<< _DL_FIRST_PLATFORM)
|
<< _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 */
|
#endif /* dl-procinfo.h */
|
||||||
|
Loading…
Reference in New Issue
Block a user