diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-27 10:01:23 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-27 10:02:17 +0000 |
commit | 402aa1dc718ec827448bfd15d6d3b67d3476037b (patch) | |
tree | 945483ca8de57e5697cbc192e7074c1733237111 | |
parent | 06b2028c5f8ac95ba1f760a9928b7784b91c5865 (diff) | |
download | meta-qt5-402aa1dc718ec827448bfd15d6d3b67d3476037b.tar.gz |
Revert "qtdeclarative: add upstream patch to fix QtQml crash with GCC 6"
This reverts commit f860986a5dd33113c40943d148b94b99fd36e546.
Accidentally included from one of my branches, but this change is
already included since 5.6.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch | 44 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 1 |
2 files changed, 0 insertions, 45 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch deleted file mode 100644 index d3ee42ef..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Wed, 24 Aug 2016 11:18:37 +1000 | ||
4 | Subject: [PATCH] Workaround crashes in QtQml code related to dead-store | ||
5 | elimination | ||
6 | |||
7 | When compiled in release mode with GCC 6, QtQml may crash. | ||
8 | This is because the C++ compiler is more aggressive about dead-store | ||
9 | elimination in situations where a memory store to a location precedes | ||
10 | the construction of an object at that memory location. | ||
11 | |||
12 | The QV4::MemoryManager::allocate{Managed,Object} functions allocate | ||
13 | memory and write to it before the caller does a placement new to | ||
14 | construct an object in the same memory. The compiler considers these | ||
15 | writes before the constructor as "dead stores" and eliminates them. | ||
16 | |||
17 | The -fno-lifetime-dse compiler flag is added to disable this more | ||
18 | aggressive dead-store eliminiation optimization. | ||
19 | |||
20 | This is a temporary workaround until a proper solution is found. | ||
21 | |||
22 | Upstream-Status: Accepted | ||
23 | |||
24 | Task-number: QTBUG-55482 | ||
25 | Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5 | ||
26 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
27 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
28 | --- | ||
29 | src/qml/qml.pro | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/src/qml/qml.pro b/src/qml/qml.pro | ||
33 | index f4862a1..651afa6 100644 | ||
34 | --- a/src/qml/qml.pro | ||
35 | +++ b/src/qml/qml.pro | ||
36 | @@ -18,7 +18,7 @@ exists("qqml_enable_gcov") { | ||
37 | |||
38 | greaterThan(QT_GCC_MAJOR_VERSION, 5) { | ||
39 | # Our code is bad. Temporary workaround. | ||
40 | - QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks | ||
41 | + QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse | ||
42 | } | ||
43 | |||
44 | QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 323ac877..eb18ae5e 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -18,7 +18,6 @@ DEPENDS += "qtbase" | |||
18 | SRC_URI += " \ | 18 | SRC_URI += " \ |
19 | file://0001-qmltestexample-fix-link.patch \ | 19 | file://0001-qmltestexample-fix-link.patch \ |
20 | file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ | 20 | file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ |
21 | file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \ | ||
22 | " | 21 | " |
23 | 22 | ||
24 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" | 23 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" |