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

This commit is contained in:
Andrew Hsieh 2014-09-05 05:26:20 +00:00 committed by Android (Google) Code Review
commit 51a50fbf07
4 changed files with 2 additions and 11 deletions

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -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