diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 21:24:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 21:24:49 +0000 |
| commit | 1360727339371ebcf24911c9ea7efd53f1d20d04 (patch) | |
| tree | c31e441ebf9c64e6265383cadf6c8707d775247b | |
| parent | c27b99f0804db5fcecebe3d1f795f0ac2f781454 (diff) | |
| parent | 78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3 (diff) | |
| download | external_llvm-1360727339371ebcf24911c9ea7efd53f1d20d04.zip external_llvm-1360727339371ebcf24911c9ea7efd53f1d20d04.tar.gz external_llvm-1360727339371ebcf24911c9ea7efd53f1d20d04.tar.bz2 | |
am 78c0f17f: Merge "llvm: rename aarch64 target to arm64"
* commit '78c0f17f14c3dd3f702d0b49afbe7a26a7fd31d3':
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 155b72e..dd10a7d 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -91,8 +91,8 @@ include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) endif -#TODOAArch64: Enable llvm build -ifneq ($(TARGET_ARCH),aarch64) +#TODOArm64: Enable llvm build +ifneq ($(TARGET_ARCH),arm64) # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -126,6 +126,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 |