diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 20:37:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-24 20:37:06 +0000 |
| commit | b43189b26f62f2b17569b07ab935ba7344be7433 (patch) | |
| tree | 946346a3ff98e99785a83a55cf04eefb88b9d72a | |
| parent | 2195ea0faf04c326c655a5e7a2b8aa6e2c54db2d (diff) | |
| parent | 6d20c2e2d88de0116203e2d6ba80b996f858abc1 (diff) | |
| download | art-b43189b26f62f2b17569b07ab935ba7344be7433.tar.gz art-b43189b26f62f2b17569b07ab935ba7344be7433.tar.bz2 art-b43189b26f62f2b17569b07ab935ba7344be7433.zip | |
am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev
* commit '6d20c2e2d88de0116203e2d6ba80b996f858abc1':
Fix imt conflict trampoline for mips64
| -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 7f68c6f590..b662821228 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 |