From 74ce4ffff6cd771a558790c7f602387491ffeb5a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 20 Jun 2018 19:04:13 -0700 Subject: [PATCH] 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 Reviewed-by: Lars Knoll --- src/corelib/tools/qsimd_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 1bc7dd06b18..7080f01619d 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