Stop checking HOST_OS, whitelist windows modules

Bug: 23566667
Change-Id: If7a149c047ccd36c7789eda3c29d6cc8977ca6d6

diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 895d39e..d940ff4 100644 (file)
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -70,7 +70,7 @@ analysis_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMAnalysis
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
 include $(LLVM_HOST_BUILD_MK)
@@ -83,7 +83,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMAnalysis
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
 include $(LLVM_DEVICE_BUILD_MK)

diff --git a/lib/Analysis/IPA/Android.mk b/lib/Analysis/IPA/Android.mk
index 2e5e571..e8d1446 100644 (file)
--- a/lib/Analysis/IPA/Android.mk
+++ b/lib/Analysis/IPA/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := $(analysis_ipa_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMipa
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -31,8 +31,6 @@ LOCAL_SRC_FILES := $(analysis_ipa_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMipa
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 7bd29a7..778211f 100644 (file)
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMAsmParser
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LOCAL_PATH)/../../llvm-host-build.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -27,8 +27,6 @@ LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMAsmParser
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LOCAL_PATH)/../../llvm-device-build.mk
 include $(BUILD_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif

diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index 3bdcdda..90cf8e2 100644 (file)
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMBitReader
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -28,8 +28,6 @@ LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMBitReader
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index 6aa208c..e733321 100644 (file)
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMBitWriter
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -29,8 +29,6 @@ LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMBitWriter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 0913d61..96afce8 100644 (file)
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -132,7 +132,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_SRC_FILES)
 LOCAL_MODULE:= libLLVMCodeGen
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -146,8 +146,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_SRC_FILES)
 LOCAL_MODULE:= libLLVMCodeGen
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index c1250d0..f3653ee 100644 (file)
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -32,7 +32,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
 LOCAL_MODULE:= libLLVMAsmPrinter
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -46,8 +46,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
 LOCAL_MODULE:= libLLVMAsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index 9501ad9..52304cc 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMSelectionDAG
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -49,8 +49,6 @@ LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMSelectionDAG
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/DebugInfo/DWARF/Android.mk b/lib/DebugInfo/DWARF/Android.mk
index 2aecfc9..2db972d 100644 (file)
--- a/lib/DebugInfo/DWARF/Android.mk
+++ b/lib/DebugInfo/DWARF/Android.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMDebugInfoDWARF
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -45,8 +45,6 @@ LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMDebugInfoDWARF
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/DebugInfo/PDB/Android.mk b/lib/DebugInfo/PDB/Android.mk
index 39c62eb..c7acf33 100644 (file)
--- a/lib/DebugInfo/PDB/Android.mk
+++ b/lib/DebugInfo/PDB/Android.mk
@@ -51,7 +51,7 @@ LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMDebugInfoPDB
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -68,8 +68,6 @@ LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMDebugInfoPDB
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 6578e2b..453cf76 100644 (file)
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE:= libLLVMExecutionEngine
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
index 5827212..c02b5e6 100644 (file)
--- a/lib/ExecutionEngine/MCJIT/Android.mk
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE:= libLLVMMCJIT
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Orc/Android.mk b/lib/ExecutionEngine/Orc/Android.mk
index 3927e74..593df87 100644 (file)
--- a/lib/ExecutionEngine/Orc/Android.mk
+++ b/lib/ExecutionEngine/Orc/Android.mk
@@ -12,7 +12,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE:= libLLVMOrcJIT
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
index 40fdd7c..e2345fb 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/Android.mk
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE:= libLLVMRuntimeDyld
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/IR/Android.mk b/lib/IR/Android.mk
index 7b0a0e9..0ba567e 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -60,7 +60,7 @@ LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMCore
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -77,8 +77,6 @@ LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMCore
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/IRReader/Android.mk b/lib/IRReader/Android.mk
index d620521..ec1b62d 100644 (file)
--- a/lib/IRReader/Android.mk
+++ b/lib/IRReader/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMIRReader
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -30,9 +30,7 @@ LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMIRReader
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif

diff --git a/lib/LibDriver/Android.mk b/lib/LibDriver/Android.mk
index 25bf075..592739a 100644 (file)
--- a/lib/LibDriver/Android.mk
+++ b/lib/LibDriver/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := $(LibDriver_SRC_FILES)
 TBLGEN_TABLES := $(LibDriver_TBLGEN_TABLES)
 
 LOCAL_MODULE:= libLLVMLibDriver
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -33,7 +33,6 @@ LOCAL_SRC_FILES := $(LibDriver_SRC_FILES)
 TBLGEN_TABLES := $(LibDriver_TBLGEN_TABLES)
 
 LOCAL_MODULE:= libLLVMLibDriver
-LOCAL_MODULE_TAGS := optional
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)

diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index 161b2ae..95f51df 100644 (file)
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -11,7 +11,7 @@ include $(CLEAR_TBLGEN_VARS)
 LOCAL_SRC_FILES := $(linker_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMLinker
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -24,7 +24,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(linker_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMLinker
-LOCAL_MODULE_TAGS := optional
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 2f87f7a..b32bc82 100644 (file)
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -58,7 +58,7 @@ LOCAL_SRC_FILES := $(mc_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMC
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 
 include $(LLVM_HOST_BUILD_MK)
@@ -73,8 +73,6 @@ LOCAL_SRC_FILES := $(mc_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMC
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/MCDisassembler/Android.mk b/lib/MC/MCDisassembler/Android.mk
index 87455e2..b8fbc34 100644 (file)
--- a/lib/MC/MCDisassembler/Android.mk
+++ b/lib/MC/MCDisassembler/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(mc_disassembler_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMCDisassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 
 include $(LLVM_HOST_BUILD_MK)
@@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(mc_disassembler_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMCDisassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
index 505a12b..45fc8d1 100644 (file)
--- a/lib/MC/MCParser/Android.mk
+++ b/lib/MC/MCParser/Android.mk
@@ -19,7 +19,7 @@ LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMCParser
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -33,8 +33,6 @@ LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMMCParser
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index 3c54971..d4e6ef9 100644 (file)
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -24,7 +24,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMObject
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(object_SRC_FILES)
 
@@ -38,7 +38,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMObject
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(object_SRC_FILES)
 

diff --git a/lib/Option/Android.mk b/lib/Option/Android.mk
index 8680ce4..6f8a58f 100644 (file)
--- a/lib/Option/Android.mk
+++ b/lib/Option/Android.mk
@@ -19,7 +19,7 @@ LOCAL_MODULE:= libLLVMOption
 
 LOCAL_CFLAGS := -D__android__
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -35,8 +35,6 @@ LOCAL_MODULE:= libLLVMOption
 
 LOCAL_CFLAGS := -D__android__
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ProfileData/Android.mk b/lib/ProfileData/Android.mk
index 1e1d5f2..64ebe7d 100644 (file)
--- a/lib/ProfileData/Android.mk
+++ b/lib/ProfileData/Android.mk
@@ -16,7 +16,7 @@ profiledata_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMProfileData
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
 include $(LLVM_HOST_BUILD_MK)
@@ -29,7 +29,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMProfileData
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
 include $(LLVM_DEVICE_BUILD_MK)

diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 811243a..6b6773f 100644 (file)
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -108,7 +108,7 @@ LOCAL_MODULE:= libLLVMSupport
 
 LOCAL_CFLAGS := -D__android__
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -124,8 +124,6 @@ LOCAL_MODULE:= libLLVMSupport
 
 LOCAL_CFLAGS := -D__android__
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index f3acd3a..452cffc 100644 (file)
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -50,7 +50,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64CodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -68,7 +68,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64CodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc

diff --git a/lib/Target/AArch64/AsmParser/Android.mk b/lib/Target/AArch64/AsmParser/Android.mk
index b7a5e9e..f86f29f 100644 (file)
--- a/lib/Target/AArch64/AsmParser/Android.mk
+++ b/lib/Target/AArch64/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64AsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
@@ -33,13 +33,12 @@ TBLGEN_TD_DIR := $(aarch64_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
-ifneq (,$(filter windows darwin,$(HOST_OS)))
 # Override the default optimization level to work around taking forever (~50m)
 # to compile AArch64AsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
 # the win_sdk.
-LOCAL_CFLAGS += -O0
-endif
+LOCAL_CFLAGS_darwin += -O0
+LOCAL_CFLAGS_windows += -O0
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -51,7 +50,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64AsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)

diff --git a/lib/Target/AArch64/Disassembler/Android.mk b/lib/Target/AArch64/Disassembler/Android.mk
index 53a65b8..05a1489 100644 (file)
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -26,8 +26,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Disassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -48,7 +46,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Disassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)

diff --git a/lib/Target/AArch64/InstPrinter/Android.mk b/lib/Target/AArch64/InstPrinter/Android.mk
index 51b4415..7c92f7f 100644 (file)
--- a/lib/Target/AArch64/InstPrinter/Android.mk
+++ b/lib/Target/AArch64/InstPrinter/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE:= libLLVMAArch64AsmPrinter
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -49,8 +49,6 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVMAArch64AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index a23c0e5..895f172 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -24,7 +24,7 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMAArch64Desc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -44,7 +44,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64Desc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..

diff --git a/lib/Target/AArch64/TargetInfo/Android.mk b/lib/Target/AArch64/TargetInfo/Android.mk
index 677f860..6a963ed 100644 (file)
--- a/lib/Target/AArch64/TargetInfo/Android.mk
+++ b/lib/Target/AArch64/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMAArch64Info
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMAArch64Info
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index a3614fa..a76f46c 100644 (file)
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -19,8 +19,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Utils
 
-LOCAL_MODULE_TAGS := optional
-
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
 
@@ -40,7 +38,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Utils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index a741f10..327bb10 100644 (file)
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -52,7 +52,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMCodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -70,7 +70,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMCodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc

diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index 5f88cc3..42c36e9 100644 (file)
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMAsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(arm_asm_parser_TBLGEN_TABLES)
@@ -33,13 +33,12 @@ TBLGEN_TD_DIR := $(arm_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
-ifneq (,$(filter windows darwin,$(HOST_OS)))
 # Override the default optimization level to work around taking forever (~50m)
 # to compile ARMAsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
 # the win_sdk.
-LOCAL_CFLAGS += -O0
-endif
+LOCAL_CFLAGS_darwin += -O0
+LOCAL_CFLAGS_windows += -O0
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -51,7 +50,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMAsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(arm_asm_parser_TBLGEN_TABLES)

diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 3db61a5..e849a69 100644 (file)
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -25,8 +25,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMARMDisassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -47,7 +45,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMARMDisassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)

diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index cefed76..d8ef32a 100644 (file)
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -25,7 +25,7 @@ LOCAL_MODULE:= libLLVMARMAsmPrinter
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -48,8 +48,6 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVMARMAsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index a5827f7..98a12d6 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMARMDesc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..

diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index e31c2b8..6b5c473 100644 (file)
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMARMInfo
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMARMInfo
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 71051bb..81f1aa2 100644 (file)
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMTarget
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -32,8 +32,6 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMTarget
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 235e788..e884031 100644 (file)
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -53,7 +53,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsCodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -72,7 +72,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsCodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc

diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk
index 7d8eec1..8cbb16c 100644 (file)
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(mips_asm_parser_TBLGEN_TABLES)
@@ -44,7 +44,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(mips_asm_parser_TBLGEN_TABLES)

diff --git a/lib/Target/Mips/Disassembler/Android.mk b/lib/Target/Mips/Disassembler/Android.mk
index 20fd87a..b1f0df5 100644 (file)
--- a/lib/Target/Mips/Disassembler/Android.mk
+++ b/lib/Target/Mips/Disassembler/Android.mk
@@ -16,7 +16,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDisassembler
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
@@ -35,7 +34,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDisassembler
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..

diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk
index f4f3a4f..fd095fd 100644 (file)
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -15,7 +15,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmPrinter
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TABLES := $(mips_asm_printer_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -34,7 +34,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmPrinter
-LOCAL_MODULE_TAGS := optional
 
 TBLGEN_TABLES := $(mips_asm_printer_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..

diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 7f462d3..19555cb 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -26,7 +26,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDesc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -46,7 +46,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDesc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..

diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index 173d05b..58a5409 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -14,7 +14,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -33,7 +33,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -44,4 +43,4 @@ LOCAL_C_INCLUDES +=   $(LOCAL_PATH)/..
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif

diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index d946b98..232a940 100644 (file)
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -46,7 +46,7 @@ LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMX86CodeGen
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -65,8 +65,6 @@ LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMX86CodeGen
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index 4235cb1..fcbbc42 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
@@ -47,7 +47,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)

diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 0b3b8a5..7b4bbc8 100644 (file)
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -27,8 +27,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Disassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -50,7 +48,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMX86Disassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)

diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
index 9881beb..13288cf 100644 (file)
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ b/lib/Target/X86/InstPrinter/Android.mk
@@ -28,8 +28,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -50,7 +48,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE := libLLVMX86AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)

diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index a3c9bc8..59dd281 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -23,7 +23,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86Desc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -43,7 +43,6 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMX86Desc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..

diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 1a6c902..e3b6e2b 100644 (file)
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=   \
 
 LOCAL_MODULE:= libLLVMX86Info
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=     \
 
 LOCAL_MODULE:= libLLVMX86Info
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
index e0c4797..ad16c16 100644 (file)
--- a/lib/Target/X86/Utils/Android.mk
+++ b/lib/Target/X86/Utils/Android.mk
@@ -14,8 +14,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Utils
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
@@ -30,7 +28,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Utils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Transforms/Hello/Android.mk b/lib/Transforms/Hello/Android.mk
index 6a09237..6cdac8a 100644 (file)
--- a/lib/Transforms/Hello/Android.mk
+++ b/lib/Transforms/Hello/Android.mk
@@ -13,11 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_hello_SRC_FILES)
 LOCAL_MODULE:= LLVMHello
 
-ifeq ($(HOST_OS),darwin)
-LOCAL_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-endif
-
-LOCAL_MODULE_TAGS := optional
+LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index f08b0ad..bd21eb6 100644 (file)
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -31,7 +31,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
 LOCAL_MODULE:= libLLVMipo
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -45,8 +45,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
 LOCAL_MODULE:= libLLVMipo
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index 62dc7d9..90d7d70 100644 (file)
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -22,7 +22,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
 LOCAL_MODULE:= libLLVMInstCombine
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -36,8 +36,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
 LOCAL_MODULE:= libLLVMInstCombine
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 23575cd..f6375be 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -17,7 +17,7 @@ instrumentation_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMInstrumentation
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM_HOST_BUILD_MK)
@@ -30,7 +30,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libLLVMInstrumentation
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM_DEVICE_BUILD_MK)

diff --git a/lib/Transforms/ObjCARC/Android.mk b/lib/Transforms/ObjCARC/Android.mk
index e120fbe..e5c9790 100644 (file)
--- a/lib/Transforms/ObjCARC/Android.mk
+++ b/lib/Transforms/ObjCARC/Android.mk
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
 LOCAL_MODULE:= libLLVMTransformObjCARC
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -34,8 +34,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
 LOCAL_MODULE:= libLLVMTransformObjCARC
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 543f052..482bb3f 100644 (file)
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -61,7 +61,7 @@ LOCAL_SRC_FILES :=    \
 
 LOCAL_MODULE:= libLLVMScalarOpts
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -75,8 +75,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
 LOCAL_MODULE:= libLLVMScalarOpts
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index d9aba22..72f4e49 100644 (file)
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -46,7 +46,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
 LOCAL_MODULE:= libLLVMTransformUtils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -60,8 +60,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
 LOCAL_MODULE:= libLLVMTransformUtils
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index ea090c0..ca67fbd 100644 (file)
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -13,7 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
 LOCAL_MODULE:= libLLVMVectorize
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -27,8 +27,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
 LOCAL_MODULE:= libLLVMVectorize
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 3093f58..061a0b7 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,8 +1,3 @@
-# Windows can't use Clang to build yet
-ifneq ($(HOST_OS),windows)
-LOCAL_CLANG := true
-endif
-
 ifeq ($(FORCE_BUILD_LLVM_DEBUG),true)
 local_optflags = -O0 -g
 else
@@ -55,12 +50,9 @@ LOCAL_C_INCLUDES :=  \
        $(LOCAL_C_INCLUDES)
 
 # Add on ncurses to have support for terminfo
-ifneq ($(HOST_OS),windows)
-LOCAL_LDLIBS += -lncurses
-ifneq ($(HOST_OS),darwin)
-LOCAL_LDLIBS += -lgcc_s
-endif
-endif
+LOCAL_LDLIBS_darwin += -lncurses
+LOCAL_LDLIBS_linux += -lncurses
+LOCAL_LDLIBS_linux += -lgcc_s
 
 LOCAL_IS_HOST_MODULE := true
 

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 183618c..aebb03e 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -73,7 +73,6 @@ llvm_host_static_libraries := \
   libLLVMMCJIT \
   libLLVMOrcJIT
 
-ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
 # HOST LLVM shared library build
 include $(CLEAR_VARS)
 LOCAL_IS_HOST_MODULE := true
@@ -92,12 +91,21 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
   $(llvm_host_static_libraries) \
   $(llvm_post_static_libraries)
 
+LOCAL_LDLIBS_windows := -limagehlp -lpsapi -lole32
+LOCAL_LDLIBS_darwin := -ldl -lpthread
+LOCAL_LDLIBS_linux := -ldl -lpthread
+
+# Use prebuilts for linux and darwin unless
+# FORCE_BUILD_LLVM_COMPONENTS is true
+ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
+LOCAL_MODULE_HOST_OS := windows
+# This can be moved out once LOCAL_MODULE_HOST_OS is enforced.
 ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi -lole32
-else
-  LOCAL_LDLIBS := -ldl -lpthread
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_SHARED_LIBRARY)
 endif
-
+else
+LOCAL_MODULE_HOST_OS := darwin linux windows
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)
 endif

diff --git a/tools/bugpoint-passes/Android.mk b/tools/bugpoint-passes/Android.mk
index bd09c69..32e000b 100644 (file)
--- a/tools/bugpoint-passes/Android.mk
+++ b/tools/bugpoint-passes/Android.mk
@@ -13,11 +13,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(bugpoint_passes_SRC_FILES)
 LOCAL_MODULE := BugpointPasses
 
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES # needed for tblgen
-ifeq ($(HOST_OS),darwin)
-LOCAL_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-endif
+LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/bugpoint/Android.mk b/tools/bugpoint/Android.mk
index 302189c..11f1305 100644 (file)
--- a/tools/bugpoint/Android.mk
+++ b/tools/bugpoint/Android.mk
@@ -43,7 +43,6 @@ bugpoint_STATIC_LIBRARIES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := bugpoint
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_IS_HOST_MODULE := true
 
@@ -52,11 +51,8 @@ LOCAL_SRC_FILES := $(bugpoint_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(bugpoint_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
-ifeq ($(HOST_OS),darwin)
-LOCAL_LDFLAGS += -Wl,-export_dynamic
-else
-LOCAL_LDFLAGS += -Wl,--export-dynamic
-endif
+LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
+LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
 include $(LLVM_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)

diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index 963f6ec..87f5311 100644 (file)
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -9,11 +9,9 @@ LOCAL_MODULE := llvm-as
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(llvm_as_SRC_FILES)
 LOCAL_LDLIBS += -lm
-ifdef USE_MINGW
-LOCAL_LDLIBS += -limagehlp
-else
-LOCAL_LDLIBS += -lpthread -ldl
-endif
+LOCAL_LDLIBS_windows := -limagehlp
+LOCAL_LDLIBS_darwin := -lpthread -ldl
+LOCAL_LDLIBS_linux := -lpthread -ldl
 
 LOCAL_STATIC_LIBRARIES := \
   libLLVMAsmParser \

diff --git a/tools/lto/Android.mk b/tools/lto/Android.mk
index ea46666..1699c1b 100644 (file)
--- a/tools/lto/Android.mk
+++ b/tools/lto/Android.mk
@@ -95,9 +95,8 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMVectorize \
   libLLVMProfileData
 
-ifndef USE_MINGW
-LOCAL_LDLIBS += -lpthread -ldl
-endif
+LOCAL_LDLIBS_darwin := -lpthread -ldl
+LOCAL_LDLIBS_linux := -lpthread -ldl
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index 9c3e327..4abdade 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -76,11 +76,8 @@ LOCAL_IS_HOST_MODULE := true
 LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
-ifeq ($(HOST_OS),darwin)
-LOCAL_LDFLAGS += -Wl,-export_dynamic
-else
-LOCAL_LDFLAGS += -Wl,--export-dynamic
-endif
+LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
+LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
 include $(LLVM_ROOT_PATH)/llvm.mk
 include $(LLVM_HOST_BUILD_MK)

diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 48cc425..cd38b5c 100644 (file)
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -50,11 +50,9 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMSupport
 
 LOCAL_LDLIBS += -lm
-ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS += -limagehlp -lpsapi
-else
-  LOCAL_LDLIBS += -lpthread -ldl
-endif
+LOCAL_LDLIBS_windows := -limagehlp -lpsapi
+LOCAL_LDLIBS_darwin := -lpthread -ldl
+LOCAL_LDLIBS_linux := -lpthread -ldl
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)