diff options
-rw-r--r-- | recipes-qt/qt5/qtjsbackend.inc | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 4479654e..a0dc6324 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc | |||
@@ -13,4 +13,5 @@ INC_PR = "r0" | |||
13 | 13 | ||
14 | SRC_URI += " \ | 14 | SRC_URI += " \ |
15 | file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ | 15 | file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ |
16 | file://0001-Fix-hardfloat-detection.patch \ | ||
16 | " | 17 | " |
diff --git a/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch b/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch new file mode 100644 index 00000000..3d86fbf1 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 05a87fccb76447ce3cb4b926128af929f26469bb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Wed, 22 May 2013 18:50:01 +0200 | ||
4 | Subject: [PATCH] Fix hardfloat detection | ||
5 | |||
6 | based on the same patch for nodejs which says : | ||
7 | |||
8 | gcc has a builtin define to denote hard abi when in use, e.g. when | ||
9 | using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore | ||
10 | we should check that to determine which calling convention is in use | ||
11 | and not __VFP_FP__ which merely indicates presence of VFP unit | ||
12 | |||
13 | The fix has been provided by Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/3rdparty/v8/src/platform-linux.cc | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc | ||
19 | index f6db423..8ae2249 100644 | ||
20 | --- a/src/3rdparty/v8/src/platform-linux.cc | ||
21 | +++ b/src/3rdparty/v8/src/platform-linux.cc | ||
22 | @@ -167,7 +167,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { | ||
23 | // calling this will return 1.0 and otherwise 0.0. | ||
24 | static void ArmUsingHardFloatHelper() { | ||
25 | asm("mov r0, #0":::"r0"); | ||
26 | -#if defined(__VFP_FP__) && !defined(__SOFTFP__) | ||
27 | +#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) | ||
28 | // Load 0x3ff00000 into r1 using instructions available in both ARM | ||
29 | // and Thumb mode. | ||
30 | asm("mov r1, #3":::"r1"); | ||
31 | -- | ||
32 | 1.7.10.4 | ||
33 | |||