diff options
| author | Keith Mok <kmok@cyngn.com> | 2015-11-06 10:00:22 -0800 |
|---|---|---|
| committer | Keith Mok <kmok@cyngn.com> | 2015-11-06 10:52:31 -0800 |
| commit | e04680049b71bc86da439adf8e2aed067f7042a7 (patch) | |
| tree | b2a068dc0222fedd08784554ecb9f016d4ab9c12 /runtime | |
| parent | e1de6f139d543546aceae8b26305a3246689fc6d (diff) | |
| download | art-e04680049b71bc86da439adf8e2aed067f7042a7.zip art-e04680049b71bc86da439adf8e2aed067f7042a7.tar.gz art-e04680049b71bc86da439adf8e2aed067f7042a7.tar.bz2 | |
Fix build breaks when using clang on M
Change-Id: I02bb193cc45623191b4711ca27ccb51d2c79f971
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm/quick_entrypoints_arm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S index d02ab14..bb9229b 100644 --- a/runtime/arch/arm/quick_entrypoints_arm.S +++ b/runtime/arch/arm/quick_entrypoints_arm.S @@ -897,7 +897,7 @@ ENTRY art_quick_imt_conflict_trampoline ldr r0, [sp, #0] @ load caller Method* ldr r0, [r0, #ART_METHOD_DEX_CACHE_METHODS_OFFSET] @ load dex_cache_resolved_methods add r0, #MIRROR_OBJECT_ARRAY_DATA_OFFSET @ get starting address of data - ldr r0, [r0, r12, lsl 2] @ load the target method + ldr r0, [r0, r12, lsl #2] @ load the target method b art_quick_invoke_interface_trampoline END art_quick_imt_conflict_trampoline |