From fa598edf4351c549628a9c0650fca3042ce8dc2c Mon Sep 17 00:00:00 2001 From: Michael Sullivan Date: Wed, 10 Feb 2016 20:27:28 +0000 Subject: [PATCH] Fix gcc build failure on ARM caused by including src/util/hwf.cpp tries to use to directly use SSE intrinsics. Make sure to only use those when actually on x86 or x86_64. --- src/util/hwf.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/hwf.cpp b/src/util/hwf.cpp index 3963836f2..74a03b620 100644 --- a/src/util/hwf.cpp +++ b/src/util/hwf.cpp @@ -29,7 +29,8 @@ Revision History: #include #endif -#ifndef _M_IA64 +#if defined(__x86_64__) || defined(_M_X64) || \ + defined(__i386) || defined(_M_IX86) #define USE_INTRINSICS #endif @@ -47,7 +48,9 @@ Revision History: // Luckily, these are kind of standardized, at least for Windows/Linux/OSX. #ifdef __clang__ #undef USE_INTRINSICS -#else +#endif + +#ifdef USE_INTRINSICS #include #endif