S390: Add new s390 platform.

The new IBM z13 is added to platform string array.
The macro _DL_PLATFORMS_COUNT is incremented to 8,
because it was not incremented by commit
"S/390: Sync AUXV capabilities and archs with kernel".

ChangeLog:

	* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z13.
	* sysdeps/s390/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increased.

(cherry picked from commit a1b0488fc9df3d895a2e5eefbcd348d3f7fe0e52)

diff --git a/ChangeLog b/ChangeLog
index 2be50490cc1bb6e5f19cb2192076fbef13a24f51..a2a66a6329f23e1160fda3c8ea301363a64fb2d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-04  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+       * sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z13.
+       * sysdeps/s390/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increased.
+
 2016-04-04  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
        * sysdeps/s390/dl-procinfo.c (_dl_s390_platforms): Add vector flag.

diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
index 0f57f03ad0a2067f18def0f404de31ea2f6086e8..2bb1f21c948161897b2e86092c0b85bc4da37c8a 100644 (file)
--- a/sysdeps/s390/dl-procinfo.c
+++ b/sysdeps/s390/dl-procinfo.c
@@ -62,11 +62,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[12][9]
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_s390_platforms
 #else
-PROCINFO_CLASS const char _dl_s390_platforms[7][7]
+PROCINFO_CLASS const char _dl_s390_platforms[8][7]
 #endif
 #ifndef PROCINFO_DECL
 = {
-    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12"
+    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13"
   }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL

diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index 151b891edec81686154fd91a36ef4bb8dbb97f8a..78da65fab5cabd272517c6473ab3e68eb2d887df 100644 (file)
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -23,7 +23,7 @@
 
 #define _DL_HWCAP_COUNT 12
 
-#define _DL_PLATFORMS_COUNT    5
+#define _DL_PLATFORMS_COUNT    8
 
 /* The kernel provides up to 32 capability bits with elf_hwcap.  */
 #define _DL_FIRST_PLATFORM     32