51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 6eb48fe80cb6dd3ef536e86d005976d1c22b170e Mon Sep 17 00:00:00 2001
|
|
From: Stefan Liebler <stli@linux.ibm.com>
|
|
Date: Thu, 21 Mar 2019 09:14:26 +0100
|
|
Subject: [PATCH 10] S390: Mark vx and vxe as important hwcap.
|
|
|
|
This patch adds vx and vxe as important hwcaps
|
|
which allows one to provide shared libraries
|
|
tuned for platforms with non-vx/-vxe, vx or vxe.
|
|
|
|
ChangeLog:
|
|
|
|
* sysdeps/s390/dl-procinfo.h (HWCAP_IMPORTANT):
|
|
Add HWCAP_S390_VX and HWCAP_S390_VXE.
|
|
|
|
(cherry picked from commit 61f5e9470fb397a4c334938ac5a667427d9047df)
|
|
|
|
Conflicts:
|
|
ChangeLog
|
|
---
|
|
ChangeLog | 5 +++++
|
|
sysdeps/s390/dl-procinfo.h | 3 ++-
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 80413dd560..7111aeb149 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2019-03-21 Stefan Liebler <stli@linux.ibm.com>
|
|
+
|
|
+ * sysdeps/s390/dl-procinfo.h (HWCAP_IMPORTANT):
|
|
+ Add HWCAP_S390_VX and HWCAP_S390_VXE.
|
|
+
|
|
2019-01-31 Paul Eggert <eggert@cs.ucla.edu>
|
|
|
|
CVE-2019-9169
|
|
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
|
|
index b4b81fc70a..99697ae649 100644
|
|
--- a/sysdeps/s390/dl-procinfo.h
|
|
+++ b/sysdeps/s390/dl-procinfo.h
|
|
@@ -57,7 +57,8 @@ enum
|
|
};
|
|
|
|
#define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \
|
|
- | HWCAP_S390_EIMM | HWCAP_S390_DFP)
|
|
+ | HWCAP_S390_EIMM | HWCAP_S390_DFP \
|
|
+ | HWCAP_S390_VX | HWCAP_S390_VXE)
|
|
|
|
/* We cannot provide a general printing function. */
|
|
#define _dl_procinfo(type, word) -1
|
|
|