diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-16 17:18:29 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 11:36:32 +0200 |
commit | 3cbc607b74a1fc410689472d8821771377fcc786 (patch) | |
tree | 1a6343905f21b2ef4164fb1be6c91a85ec14a854 /src/3rdparty/masm/masm.pri | |
parent | a443af35591224667fd681462b3446fad834a6ef (diff) |
Fix build on ARM in ARM mode (instead of thumb2)
We don't support the traditional ARM assembler (yet), only JIT on thumb2. In
order for us to reliably check that, we have to wait until the pre-processor
runs, which this patch achieves by moving all JIT enable/disable decisions into
qv4global_p.h
Change-Id: I7eff5b4fbf1cd26297a08dee16984ad867358113
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm.pri')
-rw-r--r-- | src/3rdparty/masm/masm.pri | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 63537f26d5..d7b315602e 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -1,11 +1,6 @@ -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/assembler/*.h +SOURCES += $$PWD/assembler/ARMv7Assembler.cpp +SOURCES += $$PWD/assembler/LinkBuffer.cpp HEADERS += $$PWD/wtf/*.h SOURCES += $$PWD/wtf/PrintStream.cpp |