diff options
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 6 | ||||
| -rw-r--r-- | disassembler/disassembler_arm64.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index f2dd1eecee..3ad29417fa 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -85,7 +85,11 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include external/libcxx/libcxx.mk # For disassembler_arm64. - LOCAL_SHARED_LIBRARIES += libvixl + ifeq ($$(art_ndebug_or_debug),debug) + LOCAL_SHARED_LIBRARIES += libvixld + else + LOCAL_SHARED_LIBRARIES += libvixl + endif ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) else # host diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc index fe50421ed4..bd3bebf20f 100644 --- a/disassembler/disassembler_arm64.cc +++ b/disassembler/disassembler_arm64.cc @@ -74,7 +74,7 @@ void CustomDisassembler::VisitLoadLiteral(const vixl::Instruction* instr) { ++buffer; } - void* data_address = instr->LiteralAddress(); + void* data_address = instr->LiteralAddress<void*>(); ptrdiff_t buf_size_remaining = buffer_end - buffer; vixl::Instr op = instr->Mask(vixl::LoadLiteralMask); |