(bugfix) intel compilers do not like x86intrin.h on linux (ubuntu 14.10)

gak · Mar 17, 2015 · d62924b · d62924b
1 parent 1c5aec9
commit d62924b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -192,7 +192,12 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([atexit floor ftime memset mkdir pow select setenv sqrt strchr strdup strerror strstr])
 
 # check for functions to do aligned malloc
-AC_CHECK_HEADERS([intrin.h x86intrin.h xmmintrin.h malloc.h memory.h])
+if test x"$ax_cv_c_compiler_vendor" != x"intel"; then
+    AC_CHECK_HEADERS([intrin.h x86intrin.h xmmintrin.h malloc.h memory.h])
+else
+    #intel compilers sometimes do not like x86intrin.h on linux (ubuntu 14.10)
+    AC_CHECK_HEADERS([xmmintrin.h malloc.h memory.h])
+fi
 AC_CHECK_FUNCS([memalign _mm_malloc _mm_free _aligned_malloc __mingw_aligned_malloc])
 # AC_CHECK_FUNCS([posix_memalign])
 AX_FUNC_POSIX_MEMALIGN

diff --git a/src/sse_functions.h b/src/sse_functions.h
@@ -60,7 +60,9 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 // x86intrin.h availeable since gcc 4.5.0
 #include <malloc.h>
 #include <xmmintrin.h>
+#if !defined(__INTEL_COMPILER)
 #include <x86intrin.h>
+#endif
 #else
 #include <xmmintrin.h>
 #endif