From c179fc710e3e5a53ad2f945fff152689b029e848 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 17 Mar 2015 14:58:01 +0100 Subject: Android: Fix compilation on armv5 with 4.9 toolchain Thumb instructions trigger a compiler bug in e.g. Qt Script when used with armv5 in the recent versions of the toolchain. We already disabled this for the 4.8 toolchain, but the bug is also present in 4.9, so we need to disable it there as well. Change-Id: I6cadc7efd2b59b9a2ffec038559edd0e7782a4b9 Reviewed-by: Oswald Buddenhagen --- mkspecs/android-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 26730de303..7c425bdef0 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -124,7 +124,7 @@ equals(ANDROID_TARGET_ARCH, x86) { QMAKE_CFLAGS_RELEASE = -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -gdwarf-2 -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 QMAKE_CFLAGS_DEBUG = -g -gdwarf-2 -marm -O0 -fno-omit-frame-pointer - equals(ANDROID_TARGET_ARCH, armeabi): equals(NDK_TOOLCHAIN_VERSION, 4.8) { + equals(ANDROID_TARGET_ARCH, armeabi):if(equals(NDK_TOOLCHAIN_VERSION, 4.8)|equals(NDK_TOOLCHAIN_VERSION, 4.9)) { DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND } else { QMAKE_CFLAGS_RELEASE += -mthumb -- cgit v1.2.3