This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc/ibm/2.30/master] S390: Add new s390 platform z15.
- From: Paul Clarke <pc at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 14 Nov 2019 01:50:09 -0000
- Subject: [glibc/ibm/2.30/master] S390: Add new s390 platform z15.
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=26fe8ad37a37dca167ddc70a91b91d1486b71a50
commit 26fe8ad37a37dca167ddc70a91b91d1486b71a50
Author: Stefan Liebler <stli@linux.ibm.com>
Date: Fri Oct 18 14:57:14 2019 +0200
S390: Add new s390 platform z15.
The new IBM z15 is added to platform string array.
The macro _DL_PLATFORMS_COUNT is incremented.
(cherry picked from commit 2901743568452403849be7295c8732faa7732339)
Diff:
---
sysdeps/s390/dl-procinfo.c | 4 ++--
sysdeps/s390/dl-procinfo.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
index 44c9901..1307ec4 100644
--- a/sysdeps/s390/dl-procinfo.c
+++ b/sysdeps/s390/dl-procinfo.c
@@ -63,11 +63,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[19][9]
#if !defined PROCINFO_DECL && defined SHARED
._dl_s390_platforms
#else
-PROCINFO_CLASS const char _dl_s390_platforms[9][7]
+PROCINFO_CLASS const char _dl_s390_platforms[10][7]
#endif
#ifndef PROCINFO_DECL
= {
- "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14"
+ "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15"
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index 3b1f6a6..689e961 100644
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -23,7 +23,7 @@
#define _DL_HWCAP_COUNT 19
-#define _DL_PLATFORMS_COUNT 9
+#define _DL_PLATFORMS_COUNT 10
/* The kernel provides up to 32 capability bits with elf_hwcap. */
#define _DL_FIRST_PLATFORM 32