diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-05 10:37:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 22:27:37 +0200 |
| commit | ce3767f3716bbc92a31b2008dc749f4840c23718 (patch) | |
| tree | 30fe10a63ddef0f0fd56dd5150e8676c8d23223f /src/3rdparty/masm/masm-defs.pri | |
| parent | 10be273b3c804d86ee6dde5f550fd76217a8a77d (diff) | |
Fix JIT selection on Android with ARM builds
Debug builds on Android are done as ARM builds instead of thumb because of
problems with debugging thumb builds with older toolchains. However for the JIT
we're not interested in such a choice and prefer to have a consistent choice of
JIT - thumb2 generated code in release _and_ debug builds.
Change-Id: I36b1ec76311b409e36e3fb38c46c6c193adb1be8
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index b349f5a79c..59d6827158 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,5 +1,11 @@ !ios: DEFINES += V4_ENABLE_JIT +# 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") { + DEFINES += WTF_CPU_ARM_THUMB2 +} + DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" win*: DEFINES += NOMINMAX |