diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 20:33:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-24 20:33:05 +0000 |
| commit | 78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3 (patch) | |
| tree | a663946d10ca9a7d7cb4eac0bf1fe5fd7f68e41b | |
| parent | 95015e5c45e0faca137acd16f8032f6ae09cdb6f (diff) | |
| parent | 489b8f4014f35a253f8b05eef0054ec2125f99a7 (diff) | |
| download | external_llvm-78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3.zip external_llvm-78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3.tar.gz external_llvm-78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3.tar.bz2 | |
Merge "llvm: rename aarch64 target to arm64"
| -rw-r--r-- | shared_llvm.mk | 6 | ||||
| -rw-r--r-- | tools/llc/Android.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 26e4090..0a438a2 100644 --- 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 --- 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 |