diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-06 20:51:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 20:51:07 +0000 |
| commit | c27b10b198c1d9e9b51f2303994313ec2778edd7 (patch) | |
| tree | ce1cf7e1ff95ee61c9b8bcf142800ecb3ca41bd9 | |
| parent | 877a6e141800bbf7468ea237f98c01823d0abe0a (diff) | |
| parent | 1fb20b43c912416e9f9696366235a091d2acfc65 (diff) | |
| download | external_llvm-c27b10b198c1d9e9b51f2303994313ec2778edd7.zip external_llvm-c27b10b198c1d9e9b51f2303994313ec2778edd7.tar.gz external_llvm-c27b10b198c1d9e9b51f2303994313ec2778edd7.tar.bz2 | |
am 1fb20b43: am edba52bc: Merge "[MIPS64] Temporary placeholder build, to allow other projects to build"
* commit '1fb20b43c912416e9f9696366235a091d2acfc65':
[MIPS64] Temporary placeholder build, to allow other projects to build
| -rw-r--r-- | shared_llvm.mk | 5 | ||||
| -rw-r--r-- | tools/llc/Android.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index dd10a7d..797a9b8 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -92,7 +92,8 @@ include $(BUILD_HOST_SHARED_LIBRARY) endif #TODOArm64: Enable llvm build -ifneq ($(TARGET_ARCH),arm64) +#TODOMips64: Enable llvm build +ifeq ($(filter $(TARGET_ARCH),arm64 mips64),) # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -126,6 +127,6 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) -endif # !arm64 +endif # !(arm64 || mips64) endif # don't build in unbundled branches diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk index 3f5f3df..af1f75a 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -92,7 +92,8 @@ include $(BUILD_HOST_EXECUTABLE) #===---------------------------------------------------------------=== #TODOArm64: Enable llc build -ifneq ($(TARGET_ARCH),arm64) +#TODOMips64: Enable llc build +ifeq ($(filter $(TARGET_ARCH),arm64 mips64),) include $(CLEAR_VARS) LOCAL_MODULE := llc @@ -128,4 +129,4 @@ include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_EXECUTABLE) -endif # !arm64 +endif # !(arm64 || mips64) |