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 -- lib/Target/Mips/Android.mk | 2 -- lib/Target/Mips/Disassembler/Android.mk | 2 -- lib/Target/Mips/MCTargetDesc/Android.mk | 2 -- lib/Target/Mips/TargetInfo/Android.mk | 2 -- lib/Target/X86/Android.mk | 2 -- lib/Target/X86/Disassembler/Android.mk | 2 -- lib/Target/X86/InstPrinter/Android.mk | 2 -- lib/Target/X86/MCTargetDesc/Android.mk | 2 -- lib/Target/X86/TargetInfo/Android.mk | 2 -- lib/Transforms/Scalar/Android.mk | 4 +--- 14 files changed, 1 insertion(+), 29 deletions(-) (limited to 'lib') 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 diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk index 954b1d0..97c6d9b 100644 --- a/lib/Target/Mips/Android.mk +++ b/lib/Target/Mips/Android.mk @@ -65,7 +65,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),mips) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -81,4 +80,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/Mips/Disassembler/Android.mk b/lib/Target/Mips/Disassembler/Android.mk index 4e38c4b..868b43a 100644 --- a/lib/Target/Mips/Disassembler/Android.mk +++ b/lib/Target/Mips/Disassembler/Android.mk @@ -11,7 +11,6 @@ mips_disassembler_SRC_FILES := \ # For the device # ===================================================== -ifeq ($(TARGET_ARCH),mips) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -27,7 +26,6 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/.. include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) -endif # For the host # ===================================================== diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk index fcf58c3..1bf2dea 100644 --- a/lib/Target/Mips/MCTargetDesc/Android.mk +++ b/lib/Target/Mips/MCTargetDesc/Android.mk @@ -36,7 +36,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),mips) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -53,4 +52,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/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk index e3f41bc..8db12d3 100644 --- a/lib/Target/Mips/TargetInfo/Android.mk +++ b/lib/Target/Mips/TargetInfo/Android.mk @@ -28,7 +28,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device # ===================================================== -ifeq ($(TARGET_ARCH),mips) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -44,4 +43,3 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) -endif diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk index a9c413d..c9840c3 100644 --- a/lib/Target/X86/Android.mk +++ b/lib/Target/X86/Android.mk @@ -53,7 +53,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),x86) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -69,4 +68,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/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk index 1cee663..67400ad 100644 --- a/lib/Target/X86/Disassembler/Android.mk +++ b/lib/Target/X86/Disassembler/Android.mk @@ -11,7 +11,6 @@ x86_disassembler_SRC_FILES := \ # For the device # ===================================================== -ifeq ($(TARGET_ARCH),x86) 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/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk index 0fd7058..633df62 100644 --- a/lib/Target/X86/InstPrinter/Android.mk +++ b/lib/Target/X86/InstPrinter/Android.mk @@ -14,7 +14,6 @@ x86_instprinter_SRC_FILES := \ # For the device # ===================================================== -ifeq ($(TARGET_ARCH),x86) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -33,7 +32,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/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk index 31ba842..65cd8df 100644 --- a/lib/Target/X86/MCTargetDesc/Android.mk +++ b/lib/Target/X86/MCTargetDesc/Android.mk @@ -36,7 +36,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device only # ===================================================== -ifeq ($(TARGET_ARCH),x86) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) @@ -53,4 +52,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/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk index c72b383..1c53475 100644 --- a/lib/Target/X86/TargetInfo/Android.mk +++ b/lib/Target/X86/TargetInfo/Android.mk @@ -32,7 +32,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) # For the device # ===================================================== -ifeq ($(TARGET_ARCH),x86) 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 diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk index d2e1478..d79fabe 100644 --- a/lib/Transforms/Scalar/Android.mk +++ b/lib/Transforms/Scalar/Android.mk @@ -59,9 +59,7 @@ LOCAL_MODULE:= libLLVMScalarOpts # Override the default optimization level to work around a SIGSEGV # on x86 target builds for SROA.cpp. # Bug: 8047767 -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += -O1 -endif +LOCAL_CFLAGS_x86 += -O1 LOCAL_MODULE_TAGS := optional -- cgit v1.1