diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-11-21 17:40:01 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2016-12-13 10:15:09 +0100 |
| commit | 5f4f13b47abd5eb984a83302a87b02fb4a94545d (patch) | |
| tree | 1991ea748ec0191b7706f8b65aa166c68fa1121d /sysdeps/powerpc/dl-procinfo.h | |
| parent | f38aee21e21c91b9a7391c6b55d922eaab9e3735 (diff) | |
| download | glibc-5f4f13b47abd5eb984a83302a87b02fb4a94545d.tar glibc-5f4f13b47abd5eb984a83302a87b02fb4a94545d.tar.gz glibc-5f4f13b47abd5eb984a83302a87b02fb4a94545d.tar.bz2 glibc-5f4f13b47abd5eb984a83302a87b02fb4a94545d.zip | |
powerpc: remove _dl_platform_string and _dl_powerpc_platforms
Diffstat (limited to 'sysdeps/powerpc/dl-procinfo.h')
| -rw-r--r-- | sysdeps/powerpc/dl-procinfo.h | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 2187c5e190..e7d0c018e8 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -68,13 +68,6 @@ _dl_hwcap_string (int idx) return GLRO(dl_powerpc_cap_flags)[idx]; } -static inline const char * -__attribute__ ((unused)) -_dl_platform_string (int idx) -{ - return GLRO(dl_powerpc_platforms)[idx - _DL_FIRST_PLATFORM]; -} - static inline int __attribute__ ((unused)) _dl_string_hwcap (const char *str) @@ -92,7 +85,7 @@ _dl_string_platform (const char *str) if (str == NULL) return -1; - if (strncmp (str, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_POWER4], 5) == 0) + if (strncmp (str, "power", 5) == 0) { int ret; str += 5; @@ -132,35 +125,21 @@ _dl_string_platform (const char *str) if (str[1] == '\0') return ret; } - else if (strncmp (str, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC970], - 3) == 0) + else if (strncmp (str, "ppc", 3) == 0) { - if (strcmp (str + 3, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC970] - + 3) == 0) + if (strcmp (str + 3, "970") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC970; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_CELL_BE] + 3) - == 0) + else if (strcmp (str + 3, "-cell-be") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_CELL_BE; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPCA2] + 3) - == 0) + else if (strcmp (str + 3, "a2") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPCA2; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC405] + 3) - == 0) + else if (strcmp (str + 3, "405") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC405; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC440] + 3) - == 0) + else if (strcmp (str + 3, "440") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC440; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC464] + 3) - == 0) + else if (strcmp (str + 3, "464") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC464; - else if (strcmp (str + 3, - GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC476] + 3) - == 0) + else if (strcmp (str + 3, "476") == 0) return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC476; } |