From b7325c318ecf01d4c82391c1f0a63090c8de0144 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Feb 2014 16:26:26 -0800 Subject: 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 --- lib/Target/ARM/Android.mk | 2 -- lib/Target/ARM/Disassembler/Android.mk | 2 -- lib/Target/ARM/MCTargetDesc/Android.mk | 2 -- lib/Target/ARM/TargetInfo/Android.mk | 2 -- 4 files changed, 8 deletions(-) (limited to 'lib/Target/ARM') diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk index 25b0d89..86649b2 100644 --- a/lib/Target/ARM/Android.mk +++ b/lib/Target/ARM/Android.mk @@ -67,7 +67,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -82,4 +81,3 @@ include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) -endif diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk index 51e364b..45a5407 100644 --- a/lib/Target/ARM/Disassembler/Android.mk +++ b/lib/Target/ARM/Disassembler/Android.mk @@ -11,7 +11,6 @@ arm_disassembler_SRC_FILES := \ # For the device # ===================================================== -ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -30,7 +29,6 @@ LOCAL_MODULE_TAGS := optional include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) -endif # For the host # ===================================================== diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk index af22753..faa482c 100644 --- a/lib/Target/ARM/MCTargetDesc/Android.mk +++ b/lib/Target/ARM/MCTargetDesc/Android.mk @@ -40,7 +40,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -57,4 +56,3 @@ include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) -endif diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk index d1af6ae..de4416e 100644 --- a/lib/Target/ARM/TargetInfo/Android.mk +++ b/lib/Target/ARM/TargetInfo/Android.mk @@ -32,7 +32,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device # ===================================================== -ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -52,4 +51,3 @@ LOCAL_MODULE_TAGS := optional include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) -endif -- cgit v1.1