548bcb
From 756c306502498f999fdd494477b9cea1b45e4faf Mon Sep 17 00:00:00 2001
548bcb
From: Stefan Liebler <stli@linux.ibm.com>
548bcb
Date: Fri, 21 Aug 2020 11:23:17 +0200
548bcb
Subject: [PATCH] S390: Sync HWCAP names with kernel by adding aliases [BZ
548bcb
 #25971]
548bcb
548bcb
Unfortunately some HWCAP names like HWCAP_S390_VX differs between
548bcb
kernel (see <kernel>/arch/s390/include/asm/elf.h) and glibc.
548bcb
548bcb
Therefore, those HWCAP names from kernel are now introduced as alias
548bcb
---
548bcb
 sysdeps/s390/dl-procinfo.h                | 3 +++
548bcb
 sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
548bcb
 2 files changed, 6 insertions(+)
548bcb
548bcb
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
548bcb
index 0db4bc39c7..08eee109f7 100644
548bcb
--- a/sysdeps/s390/dl-procinfo.h
548bcb
+++ b/sysdeps/s390/dl-procinfo.h
548bcb
@@ -51,8 +51,11 @@ enum
548bcb
   HWCAP_S390_HIGH_GPRS = 1 << 9,
548bcb
   HWCAP_S390_TE = 1 << 10,
548bcb
   HWCAP_S390_VX = 1 << 11,
548bcb
+  HWCAP_S390_VXRS = HWCAP_S390_VX,
548bcb
   HWCAP_S390_VXD = 1 << 12,
548bcb
+  HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD,
548bcb
   HWCAP_S390_VXE = 1 << 13,
548bcb
+  HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE,
548bcb
   HWCAP_S390_GS = 1 << 14,
548bcb
   HWCAP_S390_VXRS_EXT2 = 1 << 15,
548bcb
   HWCAP_S390_VXRS_PDE = 1 << 16,
548bcb
diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
548bcb
index 6adbec018b..f2998ff131 100644
548bcb
--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
548bcb
+++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
548bcb
@@ -36,8 +36,11 @@
548bcb
 #define HWCAP_S390_HIGH_GPRS    512
548bcb
 #define HWCAP_S390_TE           1024
548bcb
 #define HWCAP_S390_VX           2048
548bcb
+#define HWCAP_S390_VXRS         HWCAP_S390_VX
548bcb
 #define HWCAP_S390_VXD          4096
548bcb
+#define HWCAP_S390_VXRS_BCD     HWCAP_S390_VXD
548bcb
 #define HWCAP_S390_VXE          8192
548bcb
+#define HWCAP_S390_VXRS_EXT     HWCAP_S390_VXE
548bcb
 #define HWCAP_S390_GS           16384
548bcb
 #define HWCAP_S390_VXRS_EXT2    32768
548bcb
 #define HWCAP_S390_VXRS_PDE     65536
548bcb
-- 
548bcb
2.31.1
548bcb