diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-07 23:23:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-06 23:49:29 +0000 |
| commit | 1514bcd5f6e4e8efdff0ddd00c4505d596924289 (patch) | |
| tree | 0ba52c048d0801e45115ba8c4b0134184471df00 /runtime | |
| parent | 7663126dce1f9252a2f06f24c2a250b5da8aaa1a (diff) | |
| parent | bae21bb7f6ca917e0954c970f0bfd2bfa3dcc0a9 (diff) | |
| download | art-1514bcd5f6e4e8efdff0ddd00c4505d596924289.zip art-1514bcd5f6e4e8efdff0ddd00c4505d596924289.tar.gz art-1514bcd5f6e4e8efdff0ddd00c4505d596924289.tar.bz2 | |
Merge "Fix build without -Bsymbolic."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm/quick_entrypoints_arm.S | 6 | ||||
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S index 86cb16a..c4f8782 100644 --- a/runtime/arch/arm/quick_entrypoints_arm.S +++ b/runtime/arch/arm/quick_entrypoints_arm.S @@ -502,20 +502,22 @@ END art_quick_check_cast */ ENTRY art_quick_aput_obj_with_null_and_bound_check tst r0, r0 - bne art_quick_aput_obj_with_bound_check + bne art_quick_aput_obj_with_bound_check_local b art_quick_throw_null_pointer_exception END art_quick_aput_obj_with_null_and_bound_check ENTRY art_quick_aput_obj_with_bound_check +art_quick_aput_obj_with_bound_check_local: ldr r3, [r0, #ARRAY_LENGTH_OFFSET] cmp r3, r1 - bhi art_quick_aput_obj + bhi art_quick_aput_obj_local mov r0, r1 mov r1, r3 b art_quick_throw_array_bounds END art_quick_aput_obj_with_bound_check ENTRY art_quick_aput_obj +art_quick_aput_obj_local: cbz r2, .Ldo_aput_null ldr r3, [r0, #CLASS_OFFSET] ldr ip, [r2, #CLASS_OFFSET] diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 6d74b83..9a2b969 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -668,17 +668,17 @@ END_FUNCTION art_quick_check_cast */ DEFINE_FUNCTION art_quick_aput_obj_with_null_and_bound_check testl %eax, %eax - jnz SYMBOL(art_quick_aput_obj_with_bound_check) - jmp SYMBOL(art_quick_throw_null_pointer_exception) + jnz PLT_SYMBOL(art_quick_aput_obj_with_bound_check) + jmp PLT_SYMBOL(art_quick_throw_null_pointer_exception) END_FUNCTION art_quick_aput_obj_with_null_and_bound_check DEFINE_FUNCTION art_quick_aput_obj_with_bound_check movl ARRAY_LENGTH_OFFSET(%eax), %ebx cmpl %ebx, %ecx - jb SYMBOL(art_quick_aput_obj) + jb PLT_SYMBOL(art_quick_aput_obj) mov %ecx, %eax mov %ebx, %ecx - jmp SYMBOL(art_quick_throw_array_bounds) + jmp PLT_SYMBOL(art_quick_throw_array_bounds) END_FUNCTION art_quick_aput_obj_with_bound_check DEFINE_FUNCTION art_quick_aput_obj @@ -1108,7 +1108,7 @@ DEFINE_FUNCTION art_quick_imt_conflict_trampoline movd %xmm0, %ecx // get target method index stored in xmm0 movl OBJECT_ARRAY_DATA_OFFSET(%eax, %ecx, 4), %eax // load the target method POP ecx - jmp SYMBOL(art_quick_invoke_interface_trampoline) + jmp PLT_SYMBOL(art_quick_invoke_interface_trampoline) END_FUNCTION art_quick_imt_conflict_trampoline DEFINE_FUNCTION art_quick_resolution_trampoline |