From dfac7ec28b6ef7ee61abda1cb763ccfc4f9e1db1 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 25 Apr 2016 01:43:45 -0400 Subject: [PATCH] Fix Debian 8/GCC 4.9 compile on Core2 Duo --- config.h | 2 +- config.recommend | 2 +- cpu.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.h b/config.h index b6e3b002..bef3ba5a 100644 --- a/config.h +++ b/config.h @@ -423,7 +423,7 @@ NAMESPACE_END // Intrinsics availible in GCC 4.3 (http://gcc.gnu.org/gcc-4.3/changes.html) and // MSVC 2008 (http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx) -#if !defined(CRYPTOPP_DISABLE_SSE4) && ((_MSC_VER >= 1500) || defined(__SSE4_1__) || defined(__SSE4_2__)) +#if !defined(CRYPTOPP_DISABLE_SSE4) && ((_MSC_VER >= 1500) || defined(__SSE4_2__)) #define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 1 #else #define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 0 diff --git a/config.recommend b/config.recommend index 2d5c7ea2..21d56ca4 100644 --- a/config.recommend +++ b/config.recommend @@ -423,7 +423,7 @@ NAMESPACE_END // Intrinsics availible in GCC 4.3 (http://gcc.gnu.org/gcc-4.3/changes.html) and // MSVC 2008 (http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx) -#if !defined(CRYPTOPP_DISABLE_SSE4) && ((_MSC_VER >= 1500) || defined(__SSE4_1__) || defined(__SSE4_2__)) +#if !defined(CRYPTOPP_DISABLE_SSE4) && ((_MSC_VER >= 1500) || defined(__SSE4_2__)) #define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 1 #else #define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 0 diff --git a/cpu.cpp b/cpu.cpp index 313d3e39..2c5ee728 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -206,7 +206,7 @@ void DetectX86Features() if ((cpuid1[3] & (1 << 26)) != 0) g_hasSSE2 = TrySSE2(); g_hasSSSE3 = g_hasSSE2 && (cpuid1[2] & (1<<9)); - g_hasSSE4 = g_hasSSE2 && ((cpuid1[2] & (1<<19)) || (cpuid1[2] & (1<<20))); + g_hasSSE4 = g_hasSSE2 && ((cpuid1[2] & (1<<19)) && (cpuid1[2] & (1<<20))); g_hasAESNI = g_hasSSE2 && (cpuid1[2] & (1<<25)); g_hasCLMUL = g_hasSSE2 && (cpuid1[2] & (1<<1));