diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-04-04 13:19:57 +0200 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-04-04 13:19:57 +0200 |
| commit | 87efefb03789022a737207f405fd73ddfa23661e (patch) | |
| tree | de8d3a8db7e37708368f959743af04e7082d3e7c | |
| parent | 65c7020d260177e57cc7cf76629d6743c3e2bca3 (diff) | |
| download | glibc-87efefb03789022a737207f405fd73ddfa23661e.tar.gz glibc-87efefb03789022a737207f405fd73ddfa23661e.tar.xz glibc-87efefb03789022a737207f405fd73ddfa23661e.zip | |
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)
| -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 2be50490cc..a2a66a6329 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. * sysdeps/s390/dl-procinfo.h: Add vector capability. * sysdeps/unix/sysv/linux/s390/bits/hwcap.h (HWCAP_S390_VX): Define. diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c index 0f57f03ad0..2bb1f21c94 100644 --- 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 151b891ede..78da65fab5 100644 --- 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 |