[COMMITTED] S390: Add new hwcap values.

Message ID 20210216154015.7644-1-stli@linux.ibm.com
State New
Headers show
Series
  • [COMMITTED] S390: Add new hwcap values.
Related show

Commit Message

DJ Delorie via Libc-alpha Feb. 16, 2021, 3:40 p.m.
The new hwcap values indicate support for arch14 architecture.
---
 sysdeps/s390/dl-procinfo.c                | 5 +++--
 sysdeps/s390/dl-procinfo.h                | 4 +++-
 sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

-- 
2.25.0

Comments

DJ Delorie via Libc-alpha Feb. 16, 2021, 3:59 p.m. | #1
* Stefan Liebler via Libc-alpha:

> The new hwcap values indicate support for arch14 architecture.


I hope it's deliberate not to update HWCAP_IMPORTANT.

Should we add an arch14 glibc-hwcaps subdirectory, or can that wait?

Thanks,
Florian
-- 
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill
DJ Delorie via Libc-alpha Feb. 16, 2021, 4:21 p.m. | #2
On 2/16/21 4:59 PM, Florian Weimer wrote:
> * Stefan Liebler via Libc-alpha:

> 

>> The new hwcap values indicate support for arch14 architecture.

> 

> I hope it's deliberate not to update HWCAP_IMPORTANT.

> 

> Should we add an arch14 glibc-hwcaps subdirectory, or can that wait?

> 

> Thanks,

> Florian

> 


Hi Florian,

I won't update HWCAP_IMPORTANT.

Even if in future the libraries are not loaded anymore in a subdirectory
with AT_PLATFORM string, I want to keep it in sync with the glibc-hwcaps
subdirectory mechanism. As soon as I know the name, I will post a
further patch. This will also introduce a further libmarkermod5.so in
order to extend tst-glibc-hwcaps.

Thanks,
Stefan

Patch

diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
index 0c334a2551..c174e27b35 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 9e1a8c7ba9..2d9c305808 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 696616e779..e9bd3684db 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