summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@theqtcompany.com>2016-01-28 14:53:29 +0100
committerMorten Johan Sørvig <morten.sorvig@theqtcompany.com>2016-01-28 14:53:29 +0100
commit85f2afbf5cd844c3d6bb5e059923958a9f3a99b6 (patch)
treed2530b5a0e2320dbc854b16a99539b5889f555f8
parent271f75af35b91f9577907c6e6cdbb3682b58d85c (diff)
Compile on emscripten
-rw-r--r--src/corelib/tools/qsimd.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index f399a148f6..971d0c0cec 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -636,14 +636,10 @@ int ffsll(quint64 i)
#endif
}
#endif
-#elif defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_OSX) || defined(Q_OS_HAIKU)
+#elif defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_OSX) || defined(Q_OS_HAIKU) || defined (Q_OS_NACL)
# define ffsll __builtin_ffsll
#endif
-#ifdef Q_OS_NACL_NEWLIB
-# define ffsll __builtin_ffsll
-#endif
-
#ifdef Q_ATOMIC_INT64_IS_SUPPORTED
Q_CORE_EXPORT QBasicAtomicInteger<quint64> qt_cpu_features[1] = { Q_BASIC_ATOMIC_INITIALIZER(0) };
#else