Skip to contentSkip to conversation

qt5webkit: add upstream patch to fix build on ARM softfp

PATCH New Fatih Aşıcı 2 participants 2 messages Dec 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5webkit: add upstream patch to fix build on ARM softfp

Cc Thomas Petazzoni <[email protected]>
---
 ...kit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch
package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch new file +35 -0
new file mode 100644
index 0000000..edbfb90
@@ -0,0 +1,35 @@
+From 8a716a29721d900069d82878c45cf87a356adba3 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <[email protected]>
+Date: Tue, 17 Dec 2013 12:26:58 +0100
+Subject: [PATCH] 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 <[email protected]>
+Signed-off-by: Fatih A??c? <[email protected]>
+---
+ Source/WTF/wtf/Platform.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 3a9b509..cddc210 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) \
+-- 
+1.8.5.1
+
Signature · 1 line
1.8.5.1
#1 lore raw

PATCH 1/1 qt5webkit: add upstream patch to fix build on ARM softfp

Dear Fatih A??c?,

Quoted 6 lines · Fatih A??c?
Cc Thomas Petazzoni <[email protected]>
---
 ...kit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com