diff options
| author | Colin Cross <ccross@android.com> | 2014-02-04 16:26:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-06 18:38:52 -0800 |
| commit | b7325c318ecf01d4c82391c1f0a63090c8de0144 (patch) | |
| tree | 8ef7f8072eedd55d7a3d330e1d7f741e034ce4f4 /tools | |
| parent | edba52bcd1a8afc5277a747727eae63023f18949 (diff) | |
| download | external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.zip external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.tar.gz external_llvm-b7325c318ecf01d4c82391c1f0a63090c8de0144.tar.bz2 | |
llvm: convert makefiles to support multilib build
Convert makefiles to allow for building two architectures at the
same time. This will also cause make checkbuild to build the target
libraries for all supported architectures.
Change-Id: Ia5e6fe5b1186a67753faafd3532ed4cb280a8b10
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) |