summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-12-17 12:26:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-17 20:35:54 +0100
commit8a716a29721d900069d82878c45cf87a356adba3 (patch)
tree182dea636bfd7fb7a5be1769326ba86caec8d075
parentfa132a44c1bf8dbb5fe73563e584bc2dc5dc78fd (diff)
Fix QtWebKit build on ARM softfp
The low level interpreter depends on hardfp, so we need to disable it when builing on ARM targets with softfp. Task-number: QTBUG-35681 Change-Id: I8aaef546b92182a87cc7116ac452d8725de6a7db Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--Source/WTF/wtf/Platform.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 3a9b509f2..cddc21076 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -771,6 +771,11 @@
#define ENABLE_LLINT 0
#endif
+/* LLINT on ARM depends on an FPU */
+#if !defined(ENABLE_LLINT) && CPU(ARM) && !CPU(ARM_HARDFP)
+#define ENABLE_LLINT 0
+#endif
+
/* On some of the platforms where we have a JIT, we want to also have the
low-level interpreter. */
#if !defined(ENABLE_LLINT) \