public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto/s390xcap.c: Add guards around the GETAUXVAL checks

Browse source 
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 <patrick.steuer@de.ibm.com>
(Merged from https://github.com/openssl/openssl/pull/9892)
This commit is contained in:
Richard Levitte 2019-09-13 11:43:18 +02:00
parent 48bb979252
commit 5768804d5a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crypto/s390xcap.c
View file

@ -19,7 +19,9 @@
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
# if __GLIBC_PREREQ(2, 16)
# include <sys/auxv.h>
# 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);