1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SIMD: Move the #include for qsimd_x86_p.h a bit lower in qsimd_p.h

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2018-06-20 19:04:13 -07:00
parent f05d1b0856
commit 74ce4ffff6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/tools/qsimd_p.h
View File

@ -179,7 +179,6 @@
#ifdef Q_PROCESSOR_X86 #ifdef Q_PROCESSOR_X86
/* -- x86 intrinsic support -- */ /* -- x86 intrinsic support -- */
# include "qsimd_x86_p.h"
# if defined(Q_CC_MSVC) && (defined(_M_X64) || _M_IX86_FP >= 2) # if defined(Q_CC_MSVC) && (defined(_M_X64) || _M_IX86_FP >= 2)
// MSVC doesn't define __SSE2__, so do it ourselves // MSVC doesn't define __SSE2__, so do it ourselves
@ -233,6 +232,8 @@
# define __RDRND__ 1 # define __RDRND__ 1
# endif # endif
# include "qsimd_x86_p.h"
#endif /* Q_PROCESSOR_X86 */ #endif /* Q_PROCESSOR_X86 */
// Clang compiler fix, see http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160222/151168.html // Clang compiler fix, see http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160222/151168.html