From ce3767f3716bbc92a31b2008dc749f4840c23718 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 5 Jul 2013 10:37:15 +0200 Subject: 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 --- src/3rdparty/masm/masm-defs.pri | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/3rdparty/masm') 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 -- cgit v1.2.3