From 5768804d5ac543b2c899bcbb96cb6f571cef9eaa Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 13 Sep 2019 11:43:18 +0200 Subject: [PATCH] crypto/s390xcap.c: Add guards around the GETAUXVAL checks HWCAP_S390_VX is missing on SUSE Linux Enterprise Server 12 SP1, so we add a guard that checks the present of that macro. While we're at it, we do the same with HWCAP_S390_STFLE, for consistency. Reviewed-by: Patrick Steuer (Merged from https://github.com/openssl/openssl/pull/9892) --- crypto/s390xcap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index eb00a4a7bd..f8e0234968 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -19,7 +19,9 @@ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) # if __GLIBC_PREREQ(2, 16) # include -# define OSSL_IMPLEMENT_GETAUXVAL +# if defined(HWCAP_S390_STFLE) && defined(HWCAP_S390_VX) +# define OSSL_IMPLEMENT_GETAUXVAL +# endif # endif #endif @@ -82,7 +84,7 @@ void OPENSSL_cpuid_setup(void) /* set a bit that will not be tested later */ OPENSSL_s390xcap_P.stfle[0] |= S390X_CAPBIT(0); -#ifdef OSSL_IMPLEMENT_GETAUXVAL +#if defined(OSSL_IMPLEMENT_GETAUXVAL) { const unsigned long hwcap = getauxval(AT_HWCAP); -- 2.25.1