diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-27 10:51:39 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-27 10:51:39 +0200 |
| commit | e1a51361e3ac137c56adc6083d095c68e9471795 (patch) | |
| tree | bfec41199e84a74265d8e77b0e8444b06bc9ff00 /sysdeps/s390/dl-procinfo.c | |
| parent | 9285e82ab3a0d1bdaa63fc740165d6a300ad0cc5 (diff) | |
| parent | 16d2ea4c821502948d193a152c8b151f5497a0d3 (diff) | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/s390/dl-procinfo.c')
| -rw-r--r-- | sysdeps/s390/dl-procinfo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c index 32c6aef951..d51d7b2379 100644 --- a/sysdeps/s390/dl-procinfo.c +++ b/sysdeps/s390/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for s390 version of processor capability information. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2006. @@ -47,11 +47,11 @@ #if !defined PROCINFO_DECL && defined SHARED ._dl_s390_cap_flags #else -PROCINFO_CLASS const char _dl_s390_cap_flags[7][6] +PROCINFO_CLASS const char _dl_s390_cap_flags[10][8] #endif #ifndef PROCINFO_DECL = { - "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp" + "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "hpage", "etf3enh", "highgprs" } #endif #if !defined SHARED || defined PROCINFO_DECL @@ -63,11 +63,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[7][6] #if !defined PROCINFO_DECL && defined SHARED ._dl_s390_platforms #else -PROCINFO_CLASS const char _dl_s390_platforms[4][7] +PROCINFO_CLASS const char _dl_s390_platforms[5][7] #endif #ifndef PROCINFO_DECL = { - "g5", "z900", "z990", "z9-109" + "g5", "z900", "z990", "z9-109", "z10" } #endif #if !defined SHARED || defined PROCINFO_DECL |