diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2013-08-29 09:35:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-29 12:50:44 +0200 |
| commit | 75156b3c213463b240269987e23b5834ede77886 (patch) | |
| tree | 5e649b09199f4c4f3ce58dc290a7c9bf17dd35a6 /src/3rdparty/masm | |
| parent | b9308169341a9756c0047760c9a4d7e357b3bb0d (diff) | |
wince: Build fix, disable the assembler when JIT is disabled.
Change-Id: Ibd22f27401c3751bc64749c6f1eea3aba57d66eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm')
| -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 |
3 files changed, 13 insertions, 10 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 { |