Remove _dl_platform_string

There are no non-trivial uses of _dl_platform_string.
This commit is contained in:
Andreas Schwab 2016-12-15 12:17:19 +01:00
parent 9d067269f5
commit 605c5ef4fb
7 changed files with 13 additions and 36 deletions

View file

@ -1,3 +1,14 @@
2017-03-14 Andreas Schwab <schwab@suse.de>
* sysdeps/generic/dl-procinfo.h (_dl_platform_string): Remove.
* sysdeps/alpha/dl-procinfo.h (_dl_platform_string): Remove.
(_dl_string_platform): Use GLRO(dl_alpha_platforms) directly.
* sysdeps/i386/dl-procinfo.h (_dl_platform_string): Remove.
* sysdeps/mips/dl-procinfo.h (_dl_platform_string): Remove.
(_dl_string_platform): Use GLRO(dl_mips_platforms) directly.
* sysdeps/s390/dl-procinfo.h (_dl_platform_string): Remove.
* sysdeps/sparc/dl-procinfo.h (_dl_platform_string): Remove.
2017-03-13 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/send.c (__send): Convert hurdish error code into

View file

@ -28,13 +28,6 @@
#define _DL_PLATFORMS_COUNT 5
static inline const char *
__attribute__ ((unused))
_dl_platform_string (int idx)
{
return GLRO(dl_alpha_platforms)[idx];
};
static inline int
__attribute__ ((unused, always_inline))
_dl_string_platform (const char *str)
@ -44,7 +37,7 @@ _dl_string_platform (const char *str)
if (str != NULL)
for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
{
if (strcmp (str, _dl_platform_string (i)) == 0)
if (strcmp (str, GLRO(dl_alpha_platforms)[i]) == 0)
return i;
}
return -1;

View file

@ -26,9 +26,6 @@
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
/* There are no different platforms defined. */
#define _dl_platform_string(idx) ""
/* By default there is no important hardware capability. */
#define HWCAP_IMPORTANT (0)

View file

@ -70,13 +70,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_x86_cap_flags)[idx];
};
static inline const char *
__attribute__ ((unused))
_dl_platform_string (int idx)
{
return GLRO(dl_x86_platforms)[idx - _DL_FIRST_PLATFORM];
};
static inline int
__attribute__ ((unused, always_inline))
_dl_string_hwcap (const char *str)

View file

@ -28,13 +28,6 @@
#define _DL_PLATFORMS_COUNT 4
static inline const char *
__attribute__ ((unused))
_dl_platform_string (int idx)
{
return GLRO(dl_mips_platforms)[idx];
};
static inline int
__attribute__ ((unused, always_inline))
_dl_string_platform (const char *str)
@ -44,7 +37,7 @@ _dl_string_platform (const char *str)
if (str != NULL)
for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
{
if (strcmp (str, _dl_platform_string (i)) == 0)
if (strcmp (str, GLRO(dl_mips_platforms)[i]) == 0)
return i;
}
return -1;

View file

@ -66,13 +66,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_s390_cap_flags)[idx];
};
static inline const char *
__attribute__ ((unused))
_dl_platform_string (int idx)
{
return GLRO(dl_s390_platforms)[idx - _DL_FIRST_PLATFORM];
};
static inline int
__attribute__ ((unused, always_inline))
_dl_string_hwcap (const char *str)

View file

@ -71,9 +71,6 @@ _dl_string_hwcap (const char *str)
#define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \
| HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2)
/* There are no different platforms defined. */
#define _dl_platform_string(idx) ""
/* There're no platforms to filter out. */
#define _DL_HWCAP_PLATFORM 0