diff options
| author | Ben Cheng <bccheng@android.com> | 2013-12-11 21:09:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 21:09:53 +0000 |
| commit | 6562c95b5280bc16c4db31d58a6cae8e5cdfde6d (patch) | |
| tree | 855df3ba90391ae43400e8146ceee50547553523 | |
| parent | 0de283dfa2686e30b44a3f6d7ce081588bf4910f (diff) | |
| parent | 0000ef0b7a446ff64de480da75b353c3ad0ff196 (diff) | |
| download | external_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.zip external_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.tar.gz external_llvm-6562c95b5280bc16c4db31d58a6cae8e5cdfde6d.tar.bz2 | |
am 0000ef0b: Merge "AArch64: Temporarily disable AArch64 build"
* commit '0000ef0b7a446ff64de480da75b353c3ad0ff196':
AArch64: Temporarily disable AArch64 build
| -rw-r--r-- | shared_llvm.mk | 5 | ||||
| -rw-r--r-- | tools/llc/Android.mk | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 8e20092..155b72e 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -91,7 +91,8 @@ include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) endif - +#TODOAArch64: Enable llvm build +ifneq ($(TARGET_ARCH),aarch64) # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -125,4 +126,6 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) +endif # !aarch64 + endif # don't build in unbundled branches diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk index bc19e9b..74015f0 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -91,6 +91,8 @@ include $(BUILD_HOST_EXECUTABLE) # llc command line tool (target) #===---------------------------------------------------------------=== +#TODOAArch64: Enable llc build +ifneq ($(TARGET_ARCH),aarch64) include $(CLEAR_VARS) LOCAL_MODULE := llc @@ -125,3 +127,5 @@ include $(LLVM_ROOT_PATH)/llvm.mk include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_EXECUTABLE) + +endif # !aarch64 |