S/390: Sync AUXV capabilities and archs with kernel

diff --git a/ChangeLog b/ChangeLog
index 6e42f8d34937124c7bbac4521a123778fdf1f8b3..f811967cfe78b1802f5c38ff12ac8c3d876c7a8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Sync
+       _dl_s390_cap_flags with kernel. Increase string length.
+       (_dl_s390_platforms): Add z196 and zEC12.
+
 2012-11-07  Joseph Myers  <joseph@codesourcery.com>
 
        * conform/data/time.h-data [!XOPEN21K && !XOPEN2K8 && !POSIX2008]:

diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
index cd53b8549216f9d02f4143ac7cd3dcbb2175a650..a22d45b80a9f624d9cd0176235aba24e2c6a2ced 100644 (file)
--- a/sysdeps/s390/dl-procinfo.c
+++ b/sysdeps/s390/dl-procinfo.c
@@ -46,11 +46,11 @@
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_s390_cap_flags
 #else
-PROCINFO_CLASS const char _dl_s390_cap_flags[10][8]
+PROCINFO_CLASS const char _dl_s390_cap_flags[10][9]
 #endif
 #ifndef PROCINFO_DECL
 = {
-     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "hpage", "etf3enh", "highgprs"
+     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", "highgprs"
   }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL
@@ -62,11 +62,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[10][8]
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_s390_platforms
 #else
-PROCINFO_CLASS const char _dl_s390_platforms[5][7]
+PROCINFO_CLASS const char _dl_s390_platforms[7][7]
 #endif
 #ifndef PROCINFO_DECL
 = {
-    "g5", "z900", "z990", "z9-109", "z10"
+    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12"
   }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL