This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-465-g5f4f13b
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Dec 2016 09:15:52 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-465-g5f4f13b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5f4f13b47abd5eb984a83302a87b02fb4a94545d (commit)
from f38aee21e21c91b9a7391c6b55d922eaab9e3735 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5f4f13b47abd5eb984a83302a87b02fb4a94545d
commit 5f4f13b47abd5eb984a83302a87b02fb4a94545d
Author: Andreas Schwab <schwab@suse.de>
Date: Mon Nov 21 17:40:01 2016 +0100
powerpc: remove _dl_platform_string and _dl_powerpc_platforms
diff --git a/ChangeLog b/ChangeLog
index beb5b59..161af38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* nptl/tst-cancel7.c (cmdline_process): Add missing case label.
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
index 0b55906..9746fa8 100644
--- a/sysdeps/powerpc/dl-procinfo.c
+++ b/sysdeps/powerpc/dl-procinfo.c
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-/* This information must be kept in sync with the _DL_HWCAP_COUNT and
- _DL_PLATFORM_COUNT definitions in procinfo.h.
+/* This information must be kept in sync with the _DL_HWCAP_COUNT
+ definition in procinfo.h.
If anything should be added here check whether the size of each string
is still ok with the given array size.
@@ -73,35 +73,5 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][10]
,
#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_CLASS
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
index 2187c5e..e7d0c01 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;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
sysdeps/powerpc/dl-procinfo.c | 34 ++--------------------------------
sysdeps/powerpc/dl-procinfo.h | 39 +++++++++------------------------------
3 files changed, 19 insertions(+), 62 deletions(-)
hooks/post-receive
--
GNU C Library master sources