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

2014-09-05 05:26:20 +00:00
parent 56355bac72 360b851034
commit 51a50fbf07
4 changed files with 2 additions and 11 deletions
--- a/core/clang/mips.mk
+++ b/core/clang/mips.mk
@@ -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 \
--- a/core/clang/mips64.mk
+++ b/core/clang/mips64.mk
@@ -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 \
--- a/core/combo/TARGET_linux-mips64.mk
+++ b/core/combo/TARGET_linux-mips64.mk
@@ -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