[PATCH 0/1] qt4-4.8.7: fix build for mips n32

[PATCH 0/1] qt4-4.8.7: fix build for mips n32

[Robert Yang]

The following changes since commit 80b3974081c4a8c604e23982a6db8fb32c616058:

  sstate: Ensure siginfo and sig files are also touched (2015-11-25 08:08:51 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/qt
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/qt

Robert Yang (1):
  qt4-4.8.7: fix build for mips n32

 meta/recipes-qt/qt4/qt4-4.8.7.inc                  |    1 +
 .../qt4/qt4-4.8.7/fix-for-mips-n32.patch           |   38 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch

-- 
1.7.9.5

[PATCH 1/1] qt4-4.8.7: fix build for mips n32

[Robert Yang]

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>
---
 meta/recipes-qt/qt4/qt4-4.8.7.inc                  |    1 +
 .../qt4/qt4-4.8.7/fix-for-mips-n32.patch           |   38 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch

diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index d165514..d71c68d 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 0000000..9f90b78
--- /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
+
-- 
1.7.9.5