summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qsimd_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-06-20 19:04:13 -0700
committerThiago Macieira <thiago.macieira@intel.com>2018-06-25 18:49:18 +0000
commit74ce4ffff6cd771a558790c7f602387491ffeb5a (patch)
tree64610cf7c4d4559d0362ba12a4fcec1798671bc7 /src/corelib/tools/qsimd_p.h
parentf05d1b0856be2e43dacb5da660b4714a64a3a0ae (diff)
SIMD: Move the #include for qsimd_x86_p.h a bit lower in qsimd_p.h
It needs to be after our extra #defines for CPU features, otherwise the qCompilerCpuFeatures variable won't be set correctly. Change-Id: Iff4151c519c144d580c4fffd153a0a93ca01bbe6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qsimd_p.h')
-rw-r--r--src/corelib/tools/qsimd_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 1bc7dd06b1..7080f01619 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -179,7 +179,6 @@
#ifdef Q_PROCESSOR_X86
/* -- x86 intrinsic support -- */
-# include "qsimd_x86_p.h"
# if defined(Q_CC_MSVC) && (defined(_M_X64) || _M_IX86_FP >= 2)
// MSVC doesn't define __SSE2__, so do it ourselves
@@ -233,6 +232,8 @@
# define __RDRND__ 1
# endif
+# include "qsimd_x86_p.h"
+
#endif /* Q_PROCESSOR_X86 */
// Clang compiler fix, see http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160222/151168.html