summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch38
1 files changed, 0 insertions, 38 deletions
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
deleted file mode 100644
index 9f90b78fad..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.7/fix-for-mips-n32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 269b1a82e654d9b8d682d861b4d0db0bd50d3106 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 27 Nov 2015 03:09:07 +0000
4Subject: [PATCH] wtf/Platform.h: fix build for mips n32
5
6If _ABIN32 is defined, it should go into 32 bit branch.
7
8Fixed:
9./wtf/StdLibExtras.h: In instantiation of 'TO WTF::bitwise_cast(FROM) [with TO = int; FROM = double]':
10runtime/JSValueInlineMethods.h:495:44: required from here
11./wtf/Assertions.h:326:47: error: size of array is negative
12 #define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]
13
14https://bugreports.qt.io/browse/QTBUG-39224
15
16Upstream-Status: Submitted
17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19---
20 src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
24index e8b03be..dfc6a74 100644
25--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
26+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
27@@ -147,7 +147,7 @@
28 /* CPU(MIPS) - MIPS 32-bit and 64-bit */
29 #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
30 || defined(__mips64))
31-#if defined(__mips64)
32+#if defined(__mips64) && !defined(_ABIN32)
33 #define WTF_CPU_MIPS64 1
34 #define WTF_MIPS_ARCH __mips64
35 #else
36--
372.5.0
38