From 5ccbd9af6a7c999e474d5a834360098f2e0440a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 4 Jan 2019 10:29:24 -0500 Subject: [PATCH] Use Microsoft x86-beased defined for __emulu --- integer.cpp | 2 +- vmac.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integer.cpp b/integer.cpp index b83ee227..68f3c6ce 100644 --- a/integer.cpp +++ b/integer.cpp @@ -233,7 +233,7 @@ static word AtomicInverseModPower2(word A) #define GetBorrow(u) u##1 #else #define Declare2Words(x) dword x; - #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && !(defined(_M_ARM) || defined(_M_ARM64)) + #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && (defined(_M_X86) || defined(_M_X64) || defined(_M_IA64)) #define MultiplyWords(p, a, b) p = __emulu(a, b); #else #define MultiplyWords(p, a, b) p = (dword)a*b; diff --git a/vmac.cpp b/vmac.cpp index d9e3b321..610f7960 100644 --- a/vmac.cpp +++ b/vmac.cpp @@ -435,7 +435,7 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64, #define AccumulateNH(a, b, c) a += word128(b)*(c) #define Multiply128(r, i1, i2) r = word128(word64(i1)) * word64(i2) #else - #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && !(defined(_M_ARM) || defined(_M_ARM64)) + #if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && (defined(_M_X86) || defined(_M_X64) || defined(_M_IA64)) #define MUL32(a, b) __emulu(word32(a), word32(b)) #else #define MUL32(a, b) ((word64)((word32)(a)) * (word32)(b))