diff options
| author | Ben Cheng <bccheng@android.com> | 2013-12-11 17:51:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-11 17:51:04 +0000 |
| commit | 0000ef0b7a446ff64de480da75b353c3ad0ff196 (patch) | |
| tree | 9507fd10e0aea832e7a26debe516c50797c1050e | |
| parent | a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410 (diff) | |
| parent | 53d672a8415c854e1faf3f797a8323f19a373361 (diff) | |
| download | external_llvm-0000ef0b7a446ff64de480da75b353c3ad0ff196.tar.gz external_llvm-0000ef0b7a446ff64de480da75b353c3ad0ff196.tar.bz2 external_llvm-0000ef0b7a446ff64de480da75b353c3ad0ff196.zip | |
Merge "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 9519cbe097..26e40905c9 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -81,7 +81,8 @@ endif include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) - +#TODOAArch64: Enable llvm build +ifneq ($(TARGET_ARCH),aarch64) # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -115,4 +116,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 bc19e9b985..74015f0449 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 |