--- ./src/util/hwf.cpp.orig	2015-10-05 06:07:19.000000000 -0600
+++ ./src/util/hwf.cpp	2015-10-08 19:57:59.046584973 -0600
@@ -29,7 +29,7 @@ Revision History:
 #include<fenv.h>
 #endif
 
-#ifndef _M_IA64
+#ifdef __x86_64
 #define USE_INTRINSICS
 #endif
 
@@ -47,7 +47,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