summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-11-23 13:03:40 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-11-25 15:43:40 +0000
commit0cfbb148ac22c1e83065793a8e200e6b36f31a83 (patch)
treed102ff91a4107db87bf0365dcd8277462263be5e
parent851b6eee5219375e791bc05b346508fceeb051c7 (diff)
downloadmeta-boot2qt-0cfbb148ac22c1e83065793a8e200e6b36f31a83.tar.gz
qtbase: add workaround for internal compiler error
mingw32 build fails with gcc's internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:11420 As a workaround, disable to offending code. Task-number: QTBUG-64707 Change-Id: I8fcc767dc3eaba131944a06d13c773842a18af76 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch25
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index d79bf57..2ae2206 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -40,3 +40,5 @@ PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
40 40
41fakeroot do_generate_qt_environment_file_mingw32() { 41fakeroot do_generate_qt_environment_file_mingw32() {
42} 42}
43
44SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch"
diff --git a/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch b/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
new file mode 100644
index 0000000..720a8ef
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-disable-qt_random_cpu.patch
@@ -0,0 +1,25 @@
1From ef03baa1188f411948f99c18d5e9414721996158 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 23 Nov 2017 11:28:47 +0200
4Subject: [PATCH] disable qt_random_cpu
5
6The code caused internal compiler error when compiling for mingw32
7
8Change-Id: Ieba798a9599a6d683c6630c6cd3731b2b909b628
9---
10 src/corelib/global/qrandom.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
14index 72ac8d3..10a8390 100644
15--- a/src/corelib/global/qrandom.cpp
16+++ b/src/corelib/global/qrandom.cpp
17@@ -92,7 +92,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
18
19 QT_BEGIN_NAMESPACE
20
21-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
22+#if 0
23 static qssize_t qt_random_cpu(void *buffer, qssize_t count) Q_DECL_NOTHROW;
24
25 # ifdef Q_PROCESSOR_X86_64