diff options
| author |   Stefan Liebler <stli@linux.ibm.com> | 2019-10-18 14:57:14 +0200 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2019-11-25 23:00:37 +0100 |
| commit | 3ed7d4306e783ba200256085f03b48decd4c78c2 (patch) | |
| tree | f29f96f50c21c8cdb2d13f1c01c8ef393adc4040 | |
| parent | Fix RISC-V vfork build with Linux 5.3 kernel headers (ChangeLog addition) (diff) | |
| download | glibc-3ed7d4306e783ba200256085f03b48decd4c78c2.tar.gz glibc-3ed7d4306e783ba200256085f03b48decd4c78c2.tar.bz2 glibc-3ed7d4306e783ba200256085f03b48decd4c78c2.zip | |
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)
(cherry picked from commit 5397c399f9604f4e0d0b17f5600e7bc756577549)
| -rw-r--r-- | sysdeps/s390/dl-procinfo.c | 4 | ||||
| -rw-r--r-- | 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 44c9901800..1307ec41de 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 3b1f6a642b..689e961ced 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 |