diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-08 23:00:17 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-08 23:00:17 (GMT) |
| commit | 40d8ec7118d5f39acec3f71d33a87f0483bd2b2b (patch) | |
| tree | 00ce4201855b5fe1d937673d0419bfe6dc798571 /src/corelib | |
| parent | 25bd4015310531002a029eaba6be60f32ad9da85 (diff) | |
| parent | ec44803109910127657b214f4556651a9619430d (diff) | |
| download | Qt-40d8ec7118d5f39acec3f71d33a87f0483bd2b2b.zip Qt-40d8ec7118d5f39acec3f71d33a87f0483bd2b2b.tar.gz Qt-40d8ec7118d5f39acec3f71d33a87f0483bd2b2b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 63ebafb..bc5e9e4 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -285,7 +285,13 @@ static inline uint detectProcessorFeatures() uint features = MMX|SSE|SSE2|CMOV; uint feature_result = 0; -#if defined(Q_CC_GNU) +#if defined (Q_OS_WIN64) + { + int info[4]; + __cpuid(info, 1); + feature_result = info[2]; + } +#elif defined(Q_CC_GNU) quint64 tmp; asm ("xchg %%rbx, %1\n" "cpuid\n" @@ -294,12 +300,6 @@ static inline uint detectProcessorFeatures() : "a" (1) : "%edx" ); -#elif defined (Q_OS_WIN64) - { - int info[4]; - __cpuid(info, 1); - feature_result = info[2]; - } #endif if (feature_result & (1u)) |