diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2010-11-18 05:40:36 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-18 11:14:57 (GMT) |
| commit | 9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456 (patch) | |
| tree | e0a9cae1fe68e260a2fcb5b3779bda15877df55b | |
| parent | a01bd14b63a784d1924133aeb965435e48a93461 (diff) | |
| download | Qt-9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456.zip Qt-9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456.tar.gz Qt-9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456.tar.bz2 | |
Check correctly before including SSE4.2 header.
Previously, this failed machines that only had SSE4.1 but not
SSE4.2 due to an assumption that nmmintrin.h could be included
when only using SSE4.1.
Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623.
Merge-request: 929
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 87fa770..2dbed76 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -87,9 +87,13 @@ QT_BEGIN_HEADER #include <tmmintrin.h> #endif -// SSE4.1 and SSE4.2 intrinsics -#if (defined(QT_HAVE_SSE4_1) || defined(QT_HAVE_SSE4_2)) && (defined(__SSE4_1__) || defined(Q_CC_MSVC)) +// SSE4.1 intrinsics +#if defined(QT_HAVE_SSE4_1) && (defined(__SSE4_1__) || defined(Q_CC_MSVC)) #include <smmintrin.h> +#endif + +// SSE4.2 intrinsics +#if defined(QT_HAVE_SSE4_2) && (defined(__SSE4_2__) || defined(Q_CC_MSVC)) #include <nmmintrin.h> #endif |