diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-30 23:20:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 17:53:27 +0000 |
| commit | 0b3c42cbc848726d83cea953a41c333856182cf9 (patch) | |
| tree | 02239eb52b57f9ede18dd35a427deb95ca115147 /core/combo/TARGET_linux-mips.mk | |
| parent | 717bc3a3b7ea2d8835523d01ba020332fb76ac5a (diff) | |
| parent | 6670e24aed1ca66f21a6af759a0d156bb3df1739 (diff) | |
| download | build-0b3c42cbc848726d83cea953a41c333856182cf9.zip build-0b3c42cbc848726d83cea953a41c333856182cf9.tar.gz build-0b3c42cbc848726d83cea953a41c333856182cf9.tar.bz2 | |
Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
Diffstat (limited to 'core/combo/TARGET_linux-mips.mk')
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 96ec210..0069bd0 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -38,7 +38,7 @@ endif $(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8 +$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 else $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -53,8 +53,8 @@ include $(BUILD_SYSTEM)/combo/fdo.mk # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),) -$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION) -$(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX := $($(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/bin/mipsel-linux-android- +$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mips64el-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION) +$(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX := $($(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/bin/mips64el-linux-android- endif $(combo_2nd_arch_prefix)TARGET_CC := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) @@ -97,24 +97,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -include $(android_config_h) \ -I $(dir $(android_config_h)) -# This warning causes dalvik not to build with gcc 4.6+ and -Werror. -# We cannot turn it off blindly since the option is not available -# in gcc-4.4.x. -ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)),) -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \ - -fno-strict-volatile-bitfields -endif - -# This is to avoid the dreaded warning compiler message: -# note: the mangling of 'va_list' has changed in GCC 4.4 -# -# The fact that the mangling changed does not affect the NDK ABI -# very fortunately (since none of the exposed APIs used va_list -# in their exported C++ functions). Also, GCC 4.5 has already -# removed the warning from the compiler. -# -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -Wno-psabi - ifneq ($(ARCH_MIPS_PAGE_SHIFT),) $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT) endif |