From 85f2afbf5cd844c3d6bb5e059923958a9f3a99b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?=
 <morten.sorvig@theqtcompany.com>
Date: Thu, 28 Jan 2016 14:53:29 +0100
Subject: Compile on emscripten

---
 src/corelib/tools/qsimd.cpp | 6 +-----
 1 file changed, 1 insertion(+), 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
-- 
cgit v1.2.3