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-defs.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-defs.pri')
-rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index aa6acc9094..cc97440257 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,19 +1,5 @@ -wince*: CONFIG += disable_jit -ios: CONFIG += disable_jit -if(win*:isEqual(QT_ARCH, "x86_64")): CONFIG += disable_jit -equals(ANDROID_TARGET_ARCH, armeabi): CONFIG += disable_jit - -disable_jit: DEFINES += ENABLE_YARR_JIT=0 -else: DEFINES += V4_ENABLE_JIT ENABLE_YARR_JIT=1 - -# On Qt/Android/ARM release builds are thumb and debug builds arm, -# but we'll force the JIT to always generate thumb2 -contains(DEFINES, V4_ENABLE_JIT):android:isEqual(QT_ARCH, "arm") { - DEFINES += WTF_CPU_ARM_THUMB2 -} - DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" win*: DEFINES += NOMINMAX @@ -22,11 +8,8 @@ DEFINES += ENABLE_LLINT=0 DEFINES += ENABLE_DFG_JIT=0 DEFINES += ENABLE_DFG_JIT_UTILITY_METHODS=1 DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 -DEFINES += ENABLE_ASSEMBLER=1 DEFINES += BUILDING_QT__ -DEFINES += ENABLE_JIT=1 - INCLUDEPATH += $$PWD/jit INCLUDEPATH += $$PWD/assembler INCLUDEPATH += $$PWD/runtime |