diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 20:25:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 20:25:26 +0000 |
| commit | 6d20c2e2d88de0116203e2d6ba80b996f858abc1 (patch) | |
| tree | 946346a3ff98e99785a83a55cf04eefb88b9d72a /runtime | |
| parent | 94e7c05f11056cc49cb66c752d68069866432d51 (diff) | |
| parent | 0b95bf17e077b9d6c52514fec5ed122017111edb (diff) | |
| download | art-6d20c2e2d88de0116203e2d6ba80b996f858abc1.zip art-6d20c2e2d88de0116203e2d6ba80b996f858abc1.tar.gz art-6d20c2e2d88de0116203e2d6ba80b996f858abc1.tar.bz2 | |
Merge "Fix imt conflict trampoline for mips64" into mnc-dev
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/mips64/quick_entrypoints_mips64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/mips64/quick_entrypoints_mips64.S b/runtime/arch/mips64/quick_entrypoints_mips64.S index 7f68c6f..b662821 100644 --- a/runtime/arch/mips64/quick_entrypoints_mips64.S +++ b/runtime/arch/mips64/quick_entrypoints_mips64.S @@ -1373,7 +1373,7 @@ ENTRY art_quick_imt_conflict_trampoline dla $t9, art_quick_invoke_interface_trampoline .cpreturn jalr $zero, $t9 - lwu $a0, MIRROR_LONG_ARRAY_DATA_OFFSET($a0) # load the target method + ld $a0, MIRROR_LONG_ARRAY_DATA_OFFSET($a0) # load the target method END art_quick_imt_conflict_trampoline .extern artQuickResolutionTrampoline |