diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c index ce8a3462d0..6c610cbf34 100644 --- a/crypto/fipsmodule/bcm.c +++ b/crypto/fipsmodule/bcm.c @@ -258,7 +258,7 @@ static void BORINGSSL_bcm_power_on_self_test(void) { // TODO: remove !defined(OPENSSL_PPC64BE) from the check below when starting to support // PPC64BE that has VCRYPTO capability. In that case, add `|| defined(OPENSSL_PPC64BE)` // to `#if defined(OPENSSL_PPC64LE)` wherever it occurs. -#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_PPC32BE) && !defined(OPENSSL_PPC64BE) +#if defined(HAS_OPENSSL_CPUID_SETUP) && !defined(OPENSSL_NO_ASM) OPENSSL_cpuid_setup(); #endif diff --git a/crypto/fipsmodule/cpucap/internal.h b/crypto/fipsmodule/cpucap/internal.h index a8f295913e..21aa351635 100644 --- a/crypto/fipsmodule/cpucap/internal.h +++ b/crypto/fipsmodule/cpucap/internal.h @@ -9,6 +9,7 @@ extern "C" { #if defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || defined(OPENSSL_ARM) || \ defined(OPENSSL_AARCH64) || defined(OPENSSL_PPC64LE) +#define HAS_OPENSSL_CPUID_SETUP // OPENSSL_cpuid_setup initializes the platform-specific feature cache. void OPENSSL_cpuid_setup(void); #endif