diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-11-26 19:35:19 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:08 +0000 |
| commit | 12c3982f4845929c0d0a1324cff4edbfb4cf59a7 (patch) | |
| tree | 38926e2d748c85077773b2f8334cc231170cb072 | |
| parent | 287809aee528fa81f024c6005a7e8572643e6fb4 (diff) | |
| download | openembedded-core-12c3982f4845929c0d0a1324cff4edbfb4cf59a7.tar.gz openembedded-core-12c3982f4845929c0d0a1324cff4edbfb4cf59a7.tar.bz2 openembedded-core-12c3982f4845929c0d0a1324cff4edbfb4cf59a7.zip | |
qt4-4.8.7: fix build for mips n32
Issue: LIN8-1720
If _ABIN32 is defined, it should go into 32 bit branch.
Fixed:
./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]':
runtime/JSValueInlineMethods.h:495:44: required from here
./wtf/Assertions.h:326:47: error: size of array is negative
#define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]
(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20151127
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc index d165514bf9..d71c68d411 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.7.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc @@ -29,6 +29,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://add_check_for_aarch64_32.patch \ file://g++.conf \ file://linux.conf \ + file://fix-for-mips-n32.patch \ " SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad" diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch b/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch new file mode 100644 index 0000000000..9f90b78fad --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch @@ -0,0 +1,38 @@ +From 269b1a82e654d9b8d682d861b4d0db0bd50d3106 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 27 Nov 2015 03:09:07 +0000 +Subject: [PATCH] wtf/Platform.h: fix build for mips n32 + +If _ABIN32 is defined, it should go into 32 bit branch. + +Fixed: +./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]': +runtime/JSValueInlineMethods.h:495:44: required from here +./wtf/Assertions.h:326:47: error: size of array is negative + #define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1] + +https://bugreports.qt.io/browse/QTBUG-39224 + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h +index e8b03be..dfc6a74 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h +@@ -147,7 +147,7 @@ + /* CPU(MIPS) - MIPS 32-bit and 64-bit */ + #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \ + || defined(__mips64)) +-#if defined(__mips64) ++#if defined(__mips64) && !defined(_ABIN32) + #define WTF_CPU_MIPS64 1 + #define WTF_MIPS_ARCH __mips64 + #else +-- +2.5.0 + |