diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/s390/dl-procinfo.c | 4 | ||||
| -rw-r--r-- | sysdeps/s390/dl-procinfo.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 56540f55a1..b540c5f995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-08-15 Stefan Liebler <stli@linux.vnet.ibm.com> + + * sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z14. + * sysdeps/s390/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increased. + 2017-08-14 Joseph Myers <joseph@codesourcery.com> * conform/data/sys/wait.h-data (si_value): Do not expect for diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c index 436e205045..e71bc1f66c 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[15][9] #if !defined PROCINFO_DECL && defined SHARED ._dl_s390_platforms #else -PROCINFO_CLASS const char _dl_s390_platforms[8][7] +PROCINFO_CLASS const char _dl_s390_platforms[9][7] #endif #ifndef PROCINFO_DECL = { - "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13" + "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14" } #endif #if !defined SHARED || defined PROCINFO_DECL diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 1645cf3b48..6db283e4dd 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -23,7 +23,7 @@ #define _DL_HWCAP_COUNT 15 -#define _DL_PLATFORMS_COUNT 8 +#define _DL_PLATFORMS_COUNT 9 /* The kernel provides up to 32 capability bits with elf_hwcap. */ #define _DL_FIRST_PLATFORM 32 |