commit 360b8510343b5efcfb67b6c654a0e912f1e3a3cd
author Andrew Hsieh <andrewhsieh@google.com> Thu Sep 04 18:58:22 2014 -0700
committer Andrew Hsieh <andrewhsieh@google.com> Thu Sep 04 19:01:22 2014 -0700
tree 8104b312c9a5d9f123dd02bae1d80078a408f863
parent 52626d2a7b4767905e8a369ddc8316c1290ad156

Change mips64 default to mips64r6 from mips64r2

Also add back mips flags previously can't be handled by clang

See aosp/build
  13066a8d4c2f8ddb2348e6d3df3948a0f4dbf105
  10326b3d7f1966381812ef55478619f714917c23

Change-Id: Iedc8dadd24f72fbd9c5589eec34677c1827290f3

core/combo/TARGET_linux-mips64.mk

diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk
index 938b11c..4511b47 100644
--- 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