diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-17 10:31:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 18:48:24 +0200 |
| commit | 7efe51e116652f5e98cfda7affd992a2d91e65b1 (patch) | |
| tree | 776b4395e4784e66713512fb80782fb3f8ba17a9 /src/3rdparty | |
| parent | bc8b25dd91e931e892f478ea5ec8f0e3062655ff (diff) | |
Android: Fix compilation when doing ARM builds
Clean up the code to determine when to _disable_ the JIT and add
Android to that list when targeting ARMv5 (dubbed armeabi as opposed
to armeabi-v7a)
Task-number: QTBUG-33507
Change-Id: Id78e08e888df8f8075d5655e15bb754cede70638
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index d2925a2b8c..836ac0c796 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,9 +1,16 @@ -!wince*:!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT ENABLE_YARR_JIT=1 -else: DEFINES += ENABLE_YARR_JIT=0 + + +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 -android:isEqual(QT_ARCH, "arm") { +contains(DEFINES, V4_ENABLE_JIT):android:isEqual(QT_ARCH, "arm") { DEFINES += WTF_CPU_ARM_THUMB2 } |