45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
commit 0ab234b7db4991121eb572bf5c4971bfeb2d49a2
|
||
|
|
Author: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
|
||
|
|
Date: Wed Nov 7 08:44:35 2012 +0100
|
||
|
|
|
||
|
|
S/390: Sync AUXV capabilities and archs with kernel
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
|
||
|
|
index cd53b85..a22d45b 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
|