diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2012-05-03 14:22:28 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:37:50 +0300 |
| commit | d519a4aafadfa98d0a3ccf600d7a53f8f735ce15 (patch) | |
| tree | b5a774bd3d30698ca11a085af89e53b87dee446b /tools | |
| parent | 13a55335422f3ee86cc9b5b3b6d2b6b8d03b0d50 (diff) | |
[android] Updated toolchain to support mips arch (x86 arch was already supported)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkspecs/android-g++/qmake.conf | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index e9e92d792b..30b63fd55a 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -9,7 +9,7 @@ include(qws.conf) # NDK_ROOT should be defined for qmake # NDK_HOST should be defined for qmake -# NDK_ABI optionally can be defined to armeabi, armeabi-v7a or x86, by default armeabi will be used +# NDK_ABI optionally can be defined to armeabi, armeabi-v7a, mips or x86, by default armeabi will be used ANDROID_TARGET_ABI=$$(NDK_ABI) # by default use armv5 architecture @@ -20,13 +20,19 @@ contains(ANDROID_TARGET_ABI, x86) { ANDROID_TARGET_ARCH = x86 ANDROID_CC_PREFIX = i686-android-linux } else { - NDK_TOOLCHAIN = arm-linux-androideabi-4.4.3 - ANDROID_TARGET_ARCH = arm - ANDROID_CC_PREFIX = arm-linux-androideabi + contains(ANDROID_TARGET_ABI, mips) { + NDK_TOOLCHAIN = mipsel-linux-android-4.4.3 + ANDROID_TARGET_ARCH = mips + ANDROID_CC_PREFIX = mipsel-linux-android + } else { + NDK_TOOLCHAIN = arm-linux-androideabi-4.4.3 + ANDROID_TARGET_ARCH = arm + ANDROID_CC_PREFIX = arm-linux-androideabi + } } # NOTE: x86 works only from android-9 and above! -ANDROID_PLATFORM = android-5 +ANDROID_PLATFORM = android-9 NDK_TOOLCHAIN_PATH=$$(NDK_ROOT)/toolchains/$$NDK_TOOLCHAIN/prebuilt/$$(NDK_HOST) @@ -48,8 +54,12 @@ contains(ANDROID_TARGET_ARCH, arm) { contains(ANDROID_TARGET_ABI, armeabi-v7a): QMAKE_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfp else: QMAKE_CFLAGS += -march=armv5te -mtune=xscale -msoft-float } else { - # x86 options - QMAKE_CFLAGS += -fstrict-aliasing -finline-limit=300 -funswitch-loops + contains(ANDROID_TARGET_ARCH, mips) { + QMAKE_CFLAGS += -fpic -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -Wno-psabi -fomit-frame-pointer -funswitch-loops -finline-limit=300 -Wa,--noexecstack + } else { + # x86 options + QMAKE_CFLAGS += -fstrict-aliasing -finline-limit=300 -funswitch-loops + } } QMAKE_CFLAGS_WARN_ON = -Wall -W |