qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable the JIT on Windows/AMD64 as well as on iOS 

Change-Id: I7402981caa2f73fd0712975e657488a4065f403f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Simon Hausmann 2013-06-25 16:07:41 +02:00 committed by The Qt Project
parent 8df7aa9d15
commit 972094c109
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdparty/masm/masm-defs.pri vendored
View File

@ -1,4 +1,4 @@
DEFINES += V4_ENABLE_JIT !ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT
DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
@ -6,11 +6,11 @@ win*: DEFINES += NOMINMAX
DEFINES += ENABLE_LLINT=0 DEFINES += ENABLE_LLINT=0
DEFINES += ENABLE_DFG_JIT=0 DEFINES += ENABLE_DFG_JIT=0
DEFINES += ENABLE_JIT=1
DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
DEFINES += ENABLE_ASSEMBLER=1 DEFINES += ENABLE_ASSEMBLER=1
DEFINES += ENABLE_YARR_JIT=1
DEFINES += BUILDING_QT__ DEFINES += BUILDING_QT__
DEFINES += ENABLE_YARR_JIT=1
DEFINES += ENABLE_JIT=1
INCLUDEPATH += $$PWD/jit INCLUDEPATH += $$PWD/jit
INCLUDEPATH += $$PWD/assembler INCLUDEPATH += $$PWD/assembler

7
tools/v4/main.cpp
View File

@ -276,7 +276,12 @@ int main(int argc, char *argv[])
use_llvm_compiler, use_llvm_compiler,
use_llvm_runtime, use_llvm_runtime,
use_llvm_jit use_llvm_jit
} mode = use_masm; } mode;
#ifdef V4_ENABLE_JIT
mode = use_masm;
#else
mode = use_moth;
#endif
#ifdef QMLJS_WITH_LLVM #ifdef QMLJS_WITH_LLVM
QQmlJS::LLVMOutputType fileType = QQmlJS::LLVMOutputObject; QQmlJS::LLVMOutputType fileType = QQmlJS::LLVMOutputObject;