summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-06-18 15:38:35 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-06-19 17:08:29 +0200
commit2de8ef2e49d1a14b5d4acf7bfd9539dadbcbc54f (patch)
treec3831666a1e515e6574f71ed032799a92938c6d4 /src/corelib
parent863a8bfab544c5f92beb9231aa2cde4b3c3e6d71 (diff)
Fix compilation with the Intel compiler on certain systems
We require the intrinsics from immintrin.h, so include it unconditioanlly with that compiler. Change-Id: I4a17676631f9d89e2d22e486f40c9b177ca06c1e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qsimd_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index f4ca971567..e1c22bac71 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -139,8 +139,10 @@
|| (defined(Q_CC_CLANG) && (__clang_major__ * 100 + __clang_minor__ >= 208)) \
|| defined(Q_CC_INTEL))
# define QT_COMPILER_SUPPORTS_X86INTRIN
-# ifndef Q_CC_INTEL
+# ifdef Q_CC_INTEL
// The Intel compiler has no <x86intrin.h> -- all intrinsics are in <immintrin.h>;
+# include <immintrin.h>
+# else
// GCC 4.4 and Clang 2.8 added a few more intrinsics there
# include <x86intrin.h>
# endif