From 0de445b56a5dc64882d2f0d05d74e344c7791b68 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 28 Jan 2018 16:10:41 -0500 Subject: [PATCH] Tie SHA availability to SSE4.2 availability This cleanly sidesteps an Android compile failure without CRYPTOPP_DISABLE_SHA --- config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.h b/config.h index e30df8b4..d320a247 100644 --- a/config.h +++ b/config.h @@ -538,7 +538,7 @@ NAMESPACE_END // Guessing at SHA for SunCC. Its not in Sun Studio 12.6. Also see // http://stackoverflow.com/questions/45872180/which-xarch-for-sha-extensions-on-solaris -#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SHA) && \ +#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SHA) && defined(CRYPTOPP_SSE42_AVAILABLE) && \ (defined(__SHA__) || (CRYPTOPP_MSC_VERSION >= 1900) || (__SUNPRO_CC >= 0x5160) || \ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1300) || \ (CRYPTOPP_LLVM_CLANG_VERSION >= 30400) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50100))