diff options
| -rw-r--r-- | runtime/Android.mk | 4 | ||||
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 09ec004064..0b13a3ffec 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -377,7 +377,9 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN) LOCAL_CFLAGS := $$(LIBART_CFLAGS) - LOCAL_LDFLAGS := $$(LIBART_LDFLAGS) + # TODO(danalbert): Work around the test failures caused by removing -Bsymbolic + # by turning it back on for libart until I get a chance to look at them. + LOCAL_LDFLAGS := $$(LIBART_LDFLAGS) -Wl,-Bsymbolic ifeq ($$(art_target_or_host),target) LOCAL_LDFLAGS += $$(LIBART_TARGET_LDFLAGS) else diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 9a2b96966f..6d74b837d1 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 PLT_SYMBOL(art_quick_aput_obj_with_bound_check) - jmp PLT_SYMBOL(art_quick_throw_null_pointer_exception) + jnz SYMBOL(art_quick_aput_obj_with_bound_check) + jmp 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 PLT_SYMBOL(art_quick_aput_obj) + jb SYMBOL(art_quick_aput_obj) mov %ecx, %eax mov %ebx, %ecx - jmp PLT_SYMBOL(art_quick_throw_array_bounds) + jmp 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 PLT_SYMBOL(art_quick_invoke_interface_trampoline) + jmp SYMBOL(art_quick_invoke_interface_trampoline) END_FUNCTION art_quick_imt_conflict_trampoline DEFINE_FUNCTION art_quick_resolution_trampoline |