From 1aa31b65118aefbde0a4ac7ab9679353751146c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Fri, 27 Dec 2013 10:02:24 +0200 Subject: [PATCH] qt5webkit: add upstream patch to fix build on ARM softfp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Aşıcı Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- ...002-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 diff --git a/package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch b/package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch new file mode 100644 index 0000000000..edbfb9059f --- /dev/null +++ b/package/qt5/qt5webkit/qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch @@ -0,0 +1,35 @@ +From 8a716a29721d900069d82878c45cf87a356adba3 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +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 +Signed-off-by: Fatih Aşıcı +--- + 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 +