StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I65c3fa9a,Id1ea5e8b

Browse Source 
* changes:
  Pair mips64r6 with mips32r2 on Aosp
  Allowing pairing mips64r6 with mips32r1 and r2
This commit is contained in:
Treehugger Robot
2016-09-06 22:38:39 +00:00
committed by Gerrit Code Review
parent 72dcbeb4bc 9f525961ac
commit 126ea5a55c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/arch/mips64/mips64r6.mk
View File

@@ -1,3 +1,3 @@
# Configuration for Android on mips64r6. # Configuration for Android on mips64r6.
ARCH_MIPS_REV6 := true ARCH_MIPS64_REV6 := true

5
target/board/generic_mips64/BoardConfig.mk
View File

@@ -31,7 +31,10 @@ TARGET_CPU_ABI := mips64
TARGET_2ND_ARCH := mips TARGET_2ND_ARCH := mips
ifeq (,$(TARGET_2ND_ARCH_VARIANT)) ifeq (,$(TARGET_2ND_ARCH_VARIANT))
ifeq ($(TARGET_ARCH_VARIANT),mips64r6) ifeq ($(TARGET_ARCH_VARIANT),mips64r6)
TARGET_2ND_ARCH_VARIANT := mips32r6 # Imgtec builds use 32r6 arch variant with Imgtec-maintained prebuilts/ndk library:
# TARGET_2ND_ARCH_VARIANT := mips32r6
# Aosp builds lack full set of mips32r6 NDK prebuilts, so use 32r2 abi:
TARGET_2ND_ARCH_VARIANT := mips32r2-fp
else else
TARGET_2ND_ARCH_VARIANT := mips32r2-fp TARGET_2ND_ARCH_VARIANT := mips32r2-fp
endif endif