llvm: rename aarch64 target to arm64

Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 26e4090..0a438a2 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -81,8 +81,8 @@ endif
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-#TODOAArch64: Enable llvm build
-ifneq ($(TARGET_ARCH),aarch64)
+#TODOArm64: Enable llvm build
+ifneq ($(TARGET_ARCH),arm64)
 # DEVICE LLVM shared library build
 include $(CLEAR_VARS)
 
@@ -116,6 +116,6 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
-endif # !aarch64
+endif # !arm64
 
 endif # don't build in unbundled branches

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 74015f0..3f5f3df 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -91,8 +91,8 @@ include $(BUILD_HOST_EXECUTABLE)
 # llc command line tool (target)
 #===---------------------------------------------------------------===
 
-#TODOAArch64: Enable llc build
-ifneq ($(TARGET_ARCH),aarch64)
+#TODOArm64: Enable llc build
+ifneq ($(TARGET_ARCH),arm64)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := llc
@@ -128,4 +128,4 @@ include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
 
-endif # !aarch64
+endif # !arm64