summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-28 09:42:00 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-28 09:42:00 (GMT)
commit556722030728c8ae7f091ede80fb9ceeeab5479a (patch)
tree2851ca55958fd0bb0f67d3f21be207c236e88aab
parent39a2b4cb71423db004ea5e6380c9c73bb35d5a2d (diff)
downloadQt-556722030728c8ae7f091ede80fb9ceeeab5479a.zip
Qt-556722030728c8ae7f091ede80fb9ceeeab5479a.tar.gz
Qt-556722030728c8ae7f091ede80fb9ceeeab5479a.tar.bz2
Don't use SSE2 if the emmintrin.h header wasn't found.
If you build on Solaris, the header isn't available, but SSE2 instructions are available on x86-64. So either we use inline assembly, or we disable the new code.
-rw-r--r--src/corelib/tools/qsimd_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 369fab7..44c1798 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -61,7 +61,7 @@ QT_MODULE(Core)
#endif
// SSE intrinsics
-#if defined(__SSE2__) && !defined(QT_BOOTSTRAPPED)
+#if defined(__SSE2__) && defined(QT_HAVE_SSE2) && !defined(QT_BOOTSTRAPPED)
#if defined(QT_LINUXBASE)
/// this is an evil hack - the posix_memalign declaration in LSB
/// is wrong - see http://bugs.linuxbase.org/show_bug.cgi?id=2431