Commit ce27d68f09 for openssl.org
commit ce27d68f092614d756d53b0051e4663c54151b18
Author: Timo Keller <tkeller@linux.ibm.com>
Date: Wed Aug 19 09:34:14 2026 +0200
Remove VXE from requirements of S390X_VX_CAPABLE
Note that in all instances where we check for VX using S390X_VX_CAPABLE
for s390x, we do not need VXE.
Signed-off-by: Timo Keller <tkeller@linux.ibm.com>
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Merge-date: Tue Sep 29 16:47:12 2026
Merged-from: https://github.com/openssl/openssl/pull/31929
diff --git a/include/arch/s390x_arch.h b/include/arch/s390x_arch.h
index a52ee7f993..5b8e92ec99 100644
--- a/include/arch/s390x_arch.h
+++ b/include/arch/s390x_arch.h
@@ -204,9 +204,9 @@ extern int OPENSSL_s390xcex_nodev;
#define S390X_KMAC_IIMP 0x4000
#define S390X_KMAC_CCUP 0x2000
-/* Are the s390x vector instructions (VX and VXE) supported? */
-/* This is the case for >= z13 (VX) and >= z14 (VXE). */
+/* Are the s390x vector instructions (VX) supported? */
+/* This is the case for >= z13. */
#define S390X_VX_CAPABLE ( \
- (OPENSSL_s390xcap_P.stfle[2] & S390X_CAPBIT(S390X_VX)) && (OPENSSL_s390xcap_P.stfle[2] & S390X_CAPBIT(S390X_VXE)))
+ (OPENSSL_s390xcap_P.stfle[2] & S390X_CAPBIT(S390X_VX)))
#endif