diff options
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 5 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 14 | ||||
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 4 | ||||
| -rw-r--r-- | src/qml/compiler/compiler.pri | 7 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 1 |
8 files changed, 18 insertions, 16 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 20f5378518..d2925a2b8c 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,4 +1,5 @@ -!wince*:!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT +!wince*:!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT ENABLE_YARR_JIT=1 +else: DEFINES += ENABLE_YARR_JIT=0 # On Qt/Android/ARM release builds are thumb and debug builds arm, # but we'll force the JIT to always generate thumb2 @@ -15,7 +16,7 @@ DEFINES += ENABLE_DFG_JIT=0 DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 DEFINES += ENABLE_ASSEMBLER=1 DEFINES += BUILDING_QT__ -DEFINES += ENABLE_YARR_JIT=1 + DEFINES += ENABLE_JIT=1 INCLUDEPATH += $$PWD/jit diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 93eff88cbd..99c364eb2c 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -1,9 +1,11 @@ -HEADERS += $$PWD/assembler/*.h -SOURCES += $$PWD/assembler/ARMAssembler.cpp -SOURCES += $$PWD/assembler/ARMv7Assembler.cpp -SOURCES += $$PWD/assembler/MacroAssemblerARM.cpp -SOURCES += $$PWD/assembler/MacroAssemblerSH4.cpp -SOURCES += $$PWD/assembler/LinkBuffer.cpp +contains(DEFINES, V4_ENABLE_JIT) { + HEADERS += $$PWD/assembler/*.h + SOURCES += $$PWD/assembler/ARMAssembler.cpp + SOURCES += $$PWD/assembler/ARMv7Assembler.cpp + SOURCES += $$PWD/assembler/MacroAssemblerARM.cpp + SOURCES += $$PWD/assembler/MacroAssemblerSH4.cpp + SOURCES += $$PWD/assembler/LinkBuffer.cpp +} HEADERS += $$PWD/wtf/*.h SOURCES += $$PWD/wtf/PrintStream.cpp diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index fd05d81a31..8027446118 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -25,15 +25,15 @@ #include "config.h" #include "YarrJIT.h" - #include <wtf/ASCIICType.h> -#include "LinkBuffer.h" #include "Options.h" #include "Yarr.h" #include "YarrCanonicalizeUCS2.h" #if ENABLE(YARR_JIT) +#include "LinkBuffer.h" + using namespace WTF; namespace JSC { namespace Yarr { diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 51a7270598..ef1a0cb4d0 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -7,7 +7,6 @@ HEADERS += \ $$PWD/qv4compileddata_p.h \ $$PWD/qv4compiler_p.h \ $$PWD/qv4codegen_p.h \ - $$PWD/qv4isel_masm_p.h \ $$PWD/qv4isel_p.h \ $$PWD/qv4jsir_p.h \ $$PWD/qv4instr_moth_p.h \ @@ -21,11 +20,15 @@ SOURCES += \ $$PWD/qv4compiler.cpp \ $$PWD/qv4codegen.cpp \ $$PWD/qv4instr_moth.cpp \ - $$PWD/qv4isel_masm.cpp \ $$PWD/qv4isel_moth.cpp \ $$PWD/qv4isel_p.cpp \ $$PWD/qv4jsir.cpp \ $$PWD/qv4ssa.cpp \ $$PWD/qv4regalloc.cpp +contains(DEFINES, V4_ENABLE_JIT) { + HEADERS += $$PWD/qv4isel_masm_p.h + SOURCES += $$PWD/qv4isel_masm.cpp +} + include(../../3rdparty/masm/masm.pri) diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 3cf6cb1aeb..47730f2f2e 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -60,7 +60,6 @@ #include <private/qqmljsast_p.h> #include <qv4jsir_p.h> #include <qv4codegen_p.h> -#include <qv4isel_masm_p.h> #include <wtf/MathExtras.h> diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp index 508e9c118b..68f6f56a18 100644 --- a/src/qml/jsruntime/qv4errorobject.cpp +++ b/src/qml/jsruntime/qv4errorobject.cpp @@ -58,7 +58,6 @@ #include <private/qqmljsast_p.h> #include <qv4jsir_p.h> #include <qv4codegen_p.h> -#include <qv4isel_masm_p.h> #ifndef Q_OS_WIN # include <time.h> diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index fd4afa3a32..add26867a8 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -55,7 +55,6 @@ #include <private/qqmljsast_p.h> #include <qv4jsir_p.h> #include <qv4codegen_p.h> -#include <qv4isel_masm_p.h> #ifndef Q_OS_WIN # include <time.h> diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 5afedd3d4f..e0c6bb5a17 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -60,7 +60,6 @@ #include <private/qqmljsast_p.h> #include <qv4jsir_p.h> #include <qv4codegen_p.h> -#include <qv4isel_masm_p.h> #ifndef Q_OS_WIN # include <time.h> |