commit 039cd7e076e904dfe6d4c9e2e2d99fb31444b2ad
author Tim Murray <timmurray@google.com> Wed Sep 03 22:46:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 03 22:46:45 2014 +0000
tree a7b0a95cdd1eeb5cbad41d8de822fa3545a40316
parent 7754e0ce894044e43c50e002e342f03317205668
parent 595d0dbd5bbf18107ee2f18c06b033e3aef9374c

Merge "Add LOCAL_NO_FPIE."

core/combo/TARGET_linux-mips64.mk

diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk
index b5555b2..a2e64c5 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

target/board/generic_mips64/BoardConfig.mk

diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk
index 5dc943a..f8cf4f0 100644
--- a/target/board/generic_mips64/BoardConfig.mk
+++ b/target/board/generic_mips64/BoardConfig.mk
@@ -24,7 +24,7 @@
 
 TARGET_ARCH := mips64
 ifeq (,$(TARGET_ARCH_VARIANT))
-TARGET_ARCH_VARIANT := mips64r2
+TARGET_ARCH_VARIANT := mips64r6
 endif
 TARGET_CPU_ABI  := mips64