diff options
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6.inc | 1 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch | 55 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 2 |
3 files changed, 57 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc index 19f52a7711..0cb7f80928 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc | |||
@@ -28,6 +28,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever | |||
28 | file://0032-aarch64_add_header.patch \ | 28 | file://0032-aarch64_add_header.patch \ |
29 | file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ | 29 | file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ |
30 | file://Fix-QWSLock-invalid-argument-logs.patch \ | 30 | file://Fix-QWSLock-invalid-argument-logs.patch \ |
31 | file://add_check_for_aarch64_32.patch \ | ||
31 | file://g++.conf \ | 32 | file://g++.conf \ |
32 | file://linux.conf \ | 33 | file://linux.conf \ |
33 | " | 34 | " |
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch b/meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch new file mode 100644 index 0000000000..ad5103dd02 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/add_check_for_aarch64_32.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> | ||
2 | Date: Sun Apr 12 19:27:10 2015 +0530 | ||
3 | |||
4 | [PATCH] add checking for AArch64 ilp32 | ||
5 | |||
6 | Cross-compiling qt4-embedded and qt4-x11-free applications for AArch64 ilp32 | ||
7 | (both big and little endian) fails with below error, | ||
8 | |||
9 | (snip) | ||
10 | In file included from ../3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h:31:0, | ||
11 | from ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalData.h:32, | ||
12 | from ../3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h:26, | ||
13 | from ../3rdparty/javascriptcore/JavaScriptCore/runtime/ClassInfo.h:26, | ||
14 | from ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.h:27, | ||
15 | from ../3rdparty/javascriptcore/JavaScriptCore/API/JSCallbackConstructor.h:30, | ||
16 | from ../3rdparty/javascriptcore/JavaScriptCore/API/JSCallbackConstructor.cpp:27: | ||
17 | ../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h: In instantiation of 'TO QTWTF::bitwise_cast(FROM) [w | ||
18 | ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h:52:49: required from here | ||
19 | ../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h:63:1: error: size of array is negative | ||
20 | ../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h: In instantiation of 'TO QTWTF::bitwise_cast(FROM) [w | ||
21 | ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h:57:47: required from here | ||
22 | ../3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h:63:1: error: size of array is negative | ||
23 | make[1]: *** [obj/release/JSCallbackConstructor.o] Error 1 | ||
24 | -- CUT -- | ||
25 | |||
26 | the error is because of JSVALUE64 is being defined while compiling programs | ||
27 | for AArch64 ilp32. This makes equal condition checking of intptr_t and double | ||
28 | datatypes as false, and results in -1 (negative) as array size in bitwise_cast | ||
29 | function. | ||
30 | |||
31 | Upstream-Status: Pending | ||
32 | |||
33 | Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> | ||
34 | |||
35 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-04-11 00:07:12.000000000 +0530 | ||
36 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-04-10 22:19:51.066279426 +0530 | ||
37 | @@ -214,6 +214,9 @@ | ||
38 | #define WTF_CPU_AARCH64 1 | ||
39 | #if defined(__AARCH64EB__) | ||
40 | #define WTF_CPU_BIG_ENDIAN 1 | ||
41 | +#if !defined(__LP64__) | ||
42 | +#define WTF_CPU_AARCH64_32 1 | ||
43 | +#endif | ||
44 | #endif | ||
45 | #endif | ||
46 | |||
47 | @@ -903,7 +906,7 @@ | ||
48 | #endif | ||
49 | |||
50 | #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) | ||
51 | -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) | ||
52 | +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || (CPU(AARCH64) && !CPU(AARCH64_32)) | ||
53 | #define WTF_USE_JSVALUE64 1 | ||
54 | #elif CPU(ARM) || CPU(PPC64) | ||
55 | #define WTF_USE_JSVALUE32 1 | ||
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index 07512db713..e94c2847b7 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc | |||
@@ -4,7 +4,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
4 | 4 | ||
5 | set_arch() { | 5 | set_arch() { |
6 | case ${TARGET_ARCH} in | 6 | case ${TARGET_ARCH} in |
7 | aarch64) QT_ARCH=aarch64 ;; | 7 | aarch64*) QT_ARCH=aarch64 ;; |
8 | arm*) QT_ARCH=arm ;; | 8 | arm*) QT_ARCH=arm ;; |
9 | i*86*) QT_ARCH=i386 ;; | 9 | i*86*) QT_ARCH=i386 ;; |
10 | mips*) QT_ARCH=mips ;; | 10 | mips*) QT_ARCH=mips ;; |