Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a50fbf authored Sep 05, 2014 by Andrew Hsieh Committed by Android (Google) Code Review Sep 05, 2014

Merge "Change mips64 default to mips64r6 from mips64r2" into lmp-dev

parents 56355bac 360b8510

core/clang/mips.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -7,14 +7,6 @@ CLANG_CONFIG_mips_EXTRA_LDFLAGS :=
		# Include common unknown flags
		CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \
		$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
		-mips32 \
		-mips32r2 \
		-mips32r6 \
		-mfp32 \
		-mfp64 \
		-mfpxx \
		-modd-spreg \
		-mno-odd-spreg \
		-fno-strict-volatile-bitfields \
		-fgcse-after-reload \
		-frerun-cse-after-loop \

core/clang/mips64.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ CLANG_CONFIG_mips64_EXTRA_LDFLAGS :=
		# Include common unknown flags
		CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \
		$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
		-mips64r6 \
		-fno-strict-volatile-bitfields \
		-fgcse-after-reload \
		-frerun-cse-after-loop \

core/combo/TARGET_linux-mips64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		# version.
		#
		ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
		TARGET_ARCH_VARIANT := mips64r2
		TARGET_ARCH_VARIANT := mips64r6
		endif

		# Decouple NDK library selection with platform compiler version

target/board/generic_mips64/BoardConfig.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ TARGET_NO_KERNEL := true

		TARGET_ARCH := mips64
		ifeq (,$(TARGET_ARCH_VARIANT))
		TARGET_ARCH_VARIANT := mips64r2
		TARGET_ARCH_VARIANT := mips64r6
		endif
		TARGET_CPU_ABI := mips64