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