diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 23:54:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 23:54:44 +0000 |
| commit | bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a (patch) | |
| tree | 361a9c638bf0785a9198793b8bb744ce9f9b81cf /tools | |
| parent | cfe73f379d20f50874bc523fab59c2db43388a32 (diff) | |
| parent | b7485134a2cbecc47904988b4cfde24019ac4fa1 (diff) | |
| download | external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.zip external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.tar.gz external_llvm-bd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a.tar.bz2 | |
am b7485134: am 449fc261: Merge "llvm: convert makefiles to support multilib build"
* commit 'b7485134a2cbecc47904988b4cfde24019ac4fa1':
llvm: convert makefiles to support multilib build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llc/Android.mk | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk index af1f75a..fde9f8c 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -91,9 +91,10 @@ include $(BUILD_HOST_EXECUTABLE) # llc command line tool (target) #===---------------------------------------------------------------=== -#TODOArm64: Enable llc build -#TODOMips64: Enable llc build -ifeq ($(filter $(TARGET_ARCH),arm64 mips64),) +ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH))) +$(warning TODO $(TARGET_ARCH): Enable llc build) +endif + include $(CLEAR_VARS) LOCAL_MODULE := llc @@ -103,19 +104,10 @@ LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := $(llvm_llc_SRC_FILES) LOCAL_C_INCLUDES += external/llvm/include -ifeq ($(TARGET_ARCH),arm) - LOCAL_STATIC_LIBRARIES := $(llvm_llc_arm_STATIC_LIBRARIES) -else - ifeq ($(TARGET_ARCH),mips) - LOCAL_STATIC_LIBRARIES := $(llvm_llc_mips_STATIC_LIBRARIES) - else - ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) - LOCAL_STATIC_LIBRARIES := $(llvm_llc_x86_STATIC_LIBRARIES) - else - $(error "Unsupport llc target $(TARGET_ARCH)") - endif - endif -endif +LOCAL_STATIC_LIBRARIES_arm := $(llvm_llc_arm_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_mips := $(llvm_llc_mips_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_x86 := $(llvm_llc_x86_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_x86_64 := $(llvm_llc_x86_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES) @@ -128,5 +120,3 @@ include $(LLVM_ROOT_PATH)/llvm.mk include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_EXECUTABLE) - -endif # !(arm64 || mips64) |