From 61fda89cd1c1f95c408059c33a651407ff243ee1 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 10 Mar 2014 14:31:25 +0100 Subject: Android: Turn off thumb for armv5 again The 4.8 compiler in the Android NDK sometimes produces uncompilable code for armv5. In change b4252802b3a537268b83855d2e13390bd5aedf5c we reintroduced thumb instructions on armv5 with a work-around for a particular case of this bug. However, the compiler now breaks for Qt Script. There's no time to try to find a work-around for this case, so we need to disable thumb again. It actually also seems that this is completely broken with this compiler, so it would probably be best to keep this disabled until the compiler is fixed. Especially since armv5 will become part of the CI builds now, so the compiler bug can end up blocking critical changes in the future if it's re-enabled :/ Task-number: QTBUG-37376 Change-Id: I9e1b050ce596717ba1fa7ec2f5e8a3ce3581a3af Reviewed-by: Paul Olav Tvete --- mkspecs/android-g++/qmake.conf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index e3fa924e23..732d415f9a 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -107,11 +107,15 @@ equals(ANDROID_TARGET_ARCH, x86) { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -gdwarf-2 -O2 QMAKE_CFLAGS_DEBUG = -g -gdwarf-2 -fno-omit-frame-pointer } else { # arm - QMAKE_CFLAGS_RELEASE = -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -gdwarf-2 -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 + 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): equals(NDK_TOOLCHAIN_VERSION, 4.8) { DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND + } else { + QMAKE_CFLAGS_RELEASE += -mthumb + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb + } } QMAKE_CFLAGS_SHLIB = -fPIC -- cgit v1.2.3