summaryrefslogtreecommitdiffstats
path: root/compiler/Android.mk
diff options
context:
space:
mode:
authorSerban Constantinescu <serban.constantinescu@arm.com>2014-02-11 14:15:10 +0000
committerIan Rogers <irogers@google.com>2014-03-05 12:14:43 -0800
commited8dd492e43cbaaa435c4892447072c84dbaf2dc (patch)
treee93e3d1e7dd6770ec8e2a3ed7105a7305eb2bc4d /compiler/Android.mk
parent511472b9110d15cf30a205bb514eb98f6afce651 (diff)
downloadandroid_art-ed8dd492e43cbaaa435c4892447072c84dbaf2dc.tar.gz
android_art-ed8dd492e43cbaaa435c4892447072c84dbaf2dc.tar.bz2
android_art-ed8dd492e43cbaaa435c4892447072c84dbaf2dc.zip
AArch64: Add ARM64 Assembler
This patch adds the ARM64 Assembler and ManagedRegister backend. The implementation of the Arm64Assembler class is based on VIXL (a programmatic A64 Assembler - see external/vixl ). Change-Id: I842fd574637a953c19631eedf26f6c70d9ed7f9e Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Diffstat (limited to 'compiler/Android.mk')
-rw-r--r--compiler/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 4968ab5b41..499f23f6a5 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -79,6 +79,8 @@ LIBART_COMPILER_SRC_FILES := \
utils/arena_bit_vector.cc \
utils/arm/assembler_arm.cc \
utils/arm/managed_register_arm.cc \
+ utils/arm64/assembler_arm64.cc \
+ utils/arm64/managed_register_arm64.cc \
utils/assembler.cc \
utils/mips/assembler_mips.cc \
utils/mips/managed_register_mips.cc \
@@ -235,10 +237,10 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libcutils
+ LOCAL_SHARED_LIBRARIES += libcutils libvixl
include $(BUILD_SHARED_LIBRARY)
else # host
- LOCAL_STATIC_LIBRARIES += libcutils
+ LOCAL_STATIC_LIBRARIES += libcutils libvixl
include $(BUILD_HOST_SHARED_LIBRARY)
endif