Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" (0b3c42cb) · Commits · e / os / android_build

core/clang/TARGET_mips.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ include $(BUILD_SYSTEM)/clang/mips.mk

		CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android
		CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \
		$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin
		$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/mips64el-linux-android/bin

		CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \
		$(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/mips.mk

+5 −6

Original line number	Diff line number	Diff line
		@@ -7,18 +7,17 @@ CLANG_CONFIG_mips_EXTRA_LDFLAGS :=
		# Include common unknown flags
		CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \
		$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
		-EL \
		-mips32 \
		-mips32r2 \
		-mhard-float \
		-mfp32 \
		-mfp64 \
		-mfpxx \
		-modd-spreg \
		-mno-odd-spreg \
		-fno-strict-volatile-bitfields \
		-fgcse-after-reload \
		-frerun-cse-after-loop \
		-frename-registers \
		-march=mips32r2 \
		-mtune=mips32r2 \
		-march=mips32 \
		-mtune=mips32 \
		-msynci \
		-mno-fused-madd

core/clang/mips64.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -9,18 +9,10 @@ CLANG_CONFIG_mips64_EXTRA_LDFLAGS :=
		# Include common unknown flags
		CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \
		$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
		-EL \
		-mips32 \
		-mips32r2 \
		-mhard-float \
		-fno-strict-volatile-bitfields \
		-fgcse-after-reload \
		-frerun-cse-after-loop \
		-frename-registers \
		-march=mips32r2 \
		-mtune=mips32r2 \
		-march=mips32 \
		-mtune=mips32 \
		-msynci \
		-mno-fused-madd

core/combo/TARGET_linux-mips.mk

+3 −21

Original line number	Diff line number	Diff line
		@@ -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

core/combo/TARGET_linux-mips64.mk

+1 −19

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ endif
		TARGET_NDK_GCC_VERSION := 4.8

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		TARGET_GCC_VERSION := 4.8
		TARGET_GCC_VERSION := 4.9
		else
		TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		endif
		@@ -97,24 +97,6 @@ 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, $(TARGET_GCC_VERSION)),)
		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.
		#
		TARGET_GLOBAL_CFLAGS += -Wno-psabi

		ifneq ($(ARCH_MIPS_PAGE_SHIFT),)
		TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT)
		endif