mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-09 04:11:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: remove _dl_platform_string and _dl_powerpc_platforms

Browse Source
This commit is contained in:
Andreas Schwab 2016-11-21 17:40:01 +01:00
parent f38aee21e2
commit 5f4f13b47a
3 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2016-12-13 Andreas Schwab <schwab@suse.de>
* sysdeps/powerpc/dl-procinfo.c: Don't define
_dl_powerpc_platforms.
* sysdeps/powerpc/dl-procinfo.h (_dl_string_platform): Use string
constants instead of referencing _dl_powerpc_platforms.
(_dl_platform_string): Remove.
2016-12-13 Florian Weimer <fweimer@redhat.com> 2016-12-13 Florian Weimer <fweimer@redhat.com>
* nptl/tst-cancel7.c (cmdline_process): Add missing case label. * nptl/tst-cancel7.c (cmdline_process): Add missing case label.

34
sysdeps/powerpc/dl-procinfo.c
View File

@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* This information must be kept in sync with the _DL_HWCAP_COUNT and /* This information must be kept in sync with the _DL_HWCAP_COUNT
_DL_PLATFORM_COUNT definitions in procinfo.h. definition in procinfo.h.
If anything should be added here check whether the size of each string If anything should be added here check whether the size of each string
is still ok with the given array size. is still ok with the given array size.
@ -73,35 +73,5 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][10]
, ,
#endif #endif
#if !defined PROCINFO_DECL && defined SHARED
._dl_powerpc_platforms
#else
PROCINFO_CLASS const char _dl_powerpc_platforms[15][12]
#endif
#ifndef PROCINFO_DECL
= {
[PPC_PLATFORM_POWER4] = "power4",
[PPC_PLATFORM_PPC970] = "ppc970",
[PPC_PLATFORM_POWER5] = "power5",
[PPC_PLATFORM_POWER5_PLUS] = "power5+",
[PPC_PLATFORM_POWER6] = "power6",
[PPC_PLATFORM_CELL_BE] = "ppc-cell-be",
[PPC_PLATFORM_POWER6X] = "power6x",
[PPC_PLATFORM_POWER7] = "power7",
[PPC_PLATFORM_PPCA2] = "ppca2",
[PPC_PLATFORM_PPC405] = "ppc405",
[PPC_PLATFORM_PPC440] = "ppc440",
[PPC_PLATFORM_PPC464] = "ppc464",
[PPC_PLATFORM_PPC476] = "ppc476",
[PPC_PLATFORM_POWER8] = "power8",
[PPC_PLATFORM_POWER9] = "power9"
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
;
#else
,
#endif
#undef PROCINFO_DECL #undef PROCINFO_DECL
#undef PROCINFO_CLASS #undef PROCINFO_CLASS

39
sysdeps/powerpc/dl-procinfo.h
View File

@ -68,13 +68,6 @@ _dl_hwcap_string (int idx)
return GLRO(dl_powerpc_cap_flags)[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 static inline int
__attribute__ ((unused)) __attribute__ ((unused))
_dl_string_hwcap (const char *str) _dl_string_hwcap (const char *str)
@ -92,7 +85,7 @@ _dl_string_platform (const char *str)
if (str == NULL) if (str == NULL)
return -1; return -1;
if (strncmp (str, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_POWER4], 5) == 0) if (strncmp (str, "power", 5) == 0)
{ {
int ret; int ret;
str += 5; str += 5;
@ -132,35 +125,21 @@ _dl_string_platform (const char *str)
if (str[1] == '\0') if (str[1] == '\0')
return ret; return ret;
} }
else if (strncmp (str, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC970], else if (strncmp (str, "ppc", 3) == 0)
3) == 0)
{ {
if (strcmp (str + 3, GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC970] if (strcmp (str + 3, "970") == 0)
+ 3) == 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC970; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC970;
else if (strcmp (str + 3, else if (strcmp (str + 3, "-cell-be") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_CELL_BE] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_CELL_BE; return _DL_FIRST_PLATFORM + PPC_PLATFORM_CELL_BE;
else if (strcmp (str + 3, else if (strcmp (str + 3, "a2") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPCA2] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPCA2; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPCA2;
else if (strcmp (str + 3, else if (strcmp (str + 3, "405") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC405] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC405; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC405;
else if (strcmp (str + 3, else if (strcmp (str + 3, "440") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC440] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC440; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC440;
else if (strcmp (str + 3, else if (strcmp (str + 3, "464") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC464] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC464; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC464;
else if (strcmp (str + 3, else if (strcmp (str + 3, "476") == 0)
GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC476] + 3)
== 0)
return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC476; return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC476;
} }