--- ./src/util/hwf.cpp.orig	2015-04-29 08:40:46.000000000 -0600
+++ ./src/util/hwf.cpp	2015-05-27 21:40:59.984496739 -0600
@@ -31,7 +31,7 @@ Revision History:
 #include <fenv.h>
 #endif
 
-#ifndef _M_IA64
+#ifdef __x86_64
 #define USE_INTRINSICS
 #endif
 
@@ -51,7 +51,7 @@ Revision History:
 // Luckily, these are kind of standardized, at least for Windows/Linux/OSX.
 #ifdef __clang__
 #undef USE_INTRINSICS
-#else
+#elif defined(USE_INTRINSICS)
 #include <emmintrin.h>
 #endif