about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2012-11-07 08:44:35 +0100
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2012-11-07 08:52:30 +0100
commit0ab234b7db4991121eb572bf5c4971bfeb2d49a2 (patch)
treee6967d9a4042306d414db58318655bcd0e078a0b
parent45832f74730cec39207be84b5a967a3ca8afb633 (diff)
downloadglibc-0ab234b7db4991121eb572bf5c4971bfeb2d49a2.tar.gz
glibc-0ab234b7db4991121eb572bf5c4971bfeb2d49a2.tar.xz
glibc-0ab234b7db4991121eb572bf5c4971bfeb2d49a2.zip
S/390: Sync AUXV capabilities and archs with kernel
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/s390/dl-procinfo.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e42f8d349..f811967cfe 100644
--- 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 cd53b85492..a22d45b80a 100644
--- 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