powerpc: remove _dl_platform_string and _dl_powerpc_platforms

diff --git a/ChangeLog b/ChangeLog
index beb5b59d012532fac7f43ba3372c4934ecd88ffc..161af38d7b0eb1889211e0333f21157d51276673 100644 (file)
--- 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 0b55906a65bd8b8d7a9306dfb76d04a2bea96435..9746fa8cfe048a1209e193384678a0ed866cb75f 100644 (file)
--- 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 2187c5e1907c4c79841e4f7d4873e66834769302..e7d0c018e80f87bcd8c35fb162cd221bd08ff9e6 100644 (file)
--- 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;
     }