63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
|
commit 6efa2d44c8a5aeb34bd1f26b707c1713aac5bdd4
|
||
|
|
Author: Stefan Liebler <stli@linux.ibm.com>
|
||
|
|
Date: Tue Feb 16 16:18:56 2021 +0100
|
||
|
|
|
||
|
|
S390: Add new hwcap values.
|
||
|
|
|
||
|
|
The new hwcap values indicate support for arch14 architecture.
|
||
|
|
|
||
|
|
(cherry picked from commit 25251c0707fe34f30a27381a5fabc35435a96621)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
|
||
|
|
index 0c334a2551c79be8..c174e27b3559c57c 100644
|
||
|
|
--- a/sysdeps/s390/dl-procinfo.c
|
||
|
|
+++ b/sysdeps/s390/dl-procinfo.c
|
||
|
|
@@ -46,12 +46,13 @@
|
||
|
|
#if !defined PROCINFO_DECL && defined SHARED
|
||
|
|
._dl_s390_cap_flags
|
||
|
|
#else
|
||
|
|
-PROCINFO_CLASS const char _dl_s390_cap_flags[19][9]
|
||
|
|
+PROCINFO_CLASS const char _dl_s390_cap_flags[21][9]
|
||
|
|
#endif
|
||
|
|
#ifndef PROCINFO_DECL
|
||
|
|
= {
|
||
|
|
"esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh",
|
||
|
|
- "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt"
|
||
|
|
+ "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt",
|
||
|
|
+ "vxp2", "nnpa"
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
#if !defined SHARED || defined PROCINFO_DECL
|
||
|
|
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
|
||
|
|
index 9e1a8c7ba9b8e01b..2d9c3058083e5dda 100644
|
||
|
|
--- a/sysdeps/s390/dl-procinfo.h
|
||
|
|
+++ b/sysdeps/s390/dl-procinfo.h
|
||
|
|
@@ -21,7 +21,7 @@
|
||
|
|
#define _DL_PROCINFO_H 1
|
||
|
|
#include <ldsodefs.h>
|
||
|
|
|
||
|
|
-#define _DL_HWCAP_COUNT 19
|
||
|
|
+#define _DL_HWCAP_COUNT 21
|
||
|
|
|
||
|
|
#define _DL_PLATFORMS_COUNT 10
|
||
|
|
|
||
|
|
@@ -61,6 +61,8 @@ enum
|
||
|
|
HWCAP_S390_VXRS_PDE = 1 << 16,
|
||
|
|
HWCAP_S390_SORT = 1 << 17,
|
||
|
|
HWCAP_S390_DFLT = 1 << 18,
|
||
|
|
+ HWCAP_S390_VXRS_PDE2 = 1 << 19,
|
||
|
|
+ HWCAP_S390_NNPA = 1 << 20,
|
||
|
|
};
|
||
|
|
|
||
|
|
#define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \
|
||
|
|
diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
|
||
|
|
index 696616e77923f654..e9bd3684db862d1b 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
|
||
|
|
@@ -46,3 +46,5 @@
|
||
|
|
#define HWCAP_S390_VXRS_PDE 65536
|
||
|
|
#define HWCAP_S390_SORT 131072
|
||
|
|
#define HWCAP_S390_DFLT 262144
|
||
|
|
+#define HWCAP_S390_VXRS_PDE2 524288
|
||
|
|
+#define HWCAP_S390_NNPA 1048576
|