summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-12 12:50:34 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-11 11:15:13 +0100
commitec17c3d029f608405252eca20e72b69e58e42b2c (patch)
tree83adca879e20d3f4bd4d93053b0078763dacae49
parenteec790c8c699d859617712a77b224750a85a93ad (diff)
downloadqtscript-ec17c3d029f608405252eca20e72b69e58e42b2c.tar.gz
Disable jitted Regexp for Mingw 64 bitv5.4.0-rc1
Work around bugs in either the jitted code, or the gcc compiler for Windows that lead to incorrect JavaScript evaluations, most notably in RegExp. This greatly reduces also the number of autotest failures. Task-number: QTBUG-40814 Change-Id: I3045738c8e97b7fc4c12238f1163dd2b844ef877 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index 6ee0aed..ec27eeb 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -56,6 +56,9 @@ contains(JAVASCRIPTCORE_JIT,no) {
DEFINES+=ENABLE_YARR=0
}
+# YARR_JIT has known issues on mingw 64 bit, see QTBUG-40814
+mingw:equals(QT_ARCH, x86_64): DEFINES+=ENABLE_YARR_JIT=0
+
# Rules when JIT enabled (not disabled)
!contains(DEFINES, ENABLE_JIT=0) {
linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {