commit cdb23d6f4d4049f6f26b0ed629fcc5018bfe3a57
author Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> Tue Feb 28 14:58:01 2017 +0100
committer Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> Tue Feb 28 16:47:39 2017 +0100
tree 36c50a72011576b54b352c01a4e759e86b12fe70
parent c0ca5fd8f54f5b8361548174cadb236d01789d6d

MIPS32: Do not use _MIPS_ARCH_MIPS64R6 in MIPS32 code

Test: booted MIPS32 and MIPS64 in QEMU

Change-Id: I413272c11ad00a0f77271302727b5860eaa7756b

runtime/arch/mips/quick_entrypoints_mips.S

diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S
index ec8ae85..4f7b495 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -2048,11 +2048,12 @@
     lw    $t0, MIRROR_STRING_COUNT_OFFSET($a0)    # this.length()
 #endif
     slt   $t1, $a2, $zero # if fromIndex < 0
-#if defined(_MIPS_ARCH_MIPS32R6) || defined(_MIPS_ARCH_MIPS64R6)
+#if defined(_MIPS_ARCH_MIPS32R6)
     seleqz $a2, $a2, $t1  #     fromIndex = 0;
 #else
     movn   $a2, $zero, $t1 #    fromIndex = 0;
 #endif
+
 #if (STRING_COMPRESSION_FEATURE)
     srl   $t0, $a3, 1     # $a3 holds count (with flag) and $t0 holds actual length
 #endif