commit 13738bf7c769638b7922cb2477471ad382632bc2
author Douglas Leung <douglas.leung@imgtec.com> Mon Oct 27 14:44:47 2014 -0700
committer Douglas Leung <douglas.leung@imgtec.com> Mon Oct 27 14:48:50 2014 -0700
tree d01e1f6c8cdd52f00eaa8f8b913b875d73a149a6
parent 4985fdf030e8e78f1c05266e989534cb26812bff

Add gp initialization to the art_quick_imt_conflict_trampoline() function.

The gp register is needed by the "la" instruction.

Change-Id: I4f2dcddba503f403dd6532d0db65ddd7df1f9626

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 aff2da7..e878ef7 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -1094,7 +1094,7 @@
      * Called to resolve an imt conflict. t0 is a hidden argument that holds the target method's
      * dex method index.
      */
-ENTRY_NO_GP art_quick_imt_conflict_trampoline
+ENTRY art_quick_imt_conflict_trampoline
     lw      $a0, 0($sp)            # load caller Method*
     lw      $a0, MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET($a0)  # load dex_cache_resolved_methods
     sll     $t0, 2                 # convert target method offset to bytes