Fix Android.mk.

14 files changed, 132 insertions, 40 deletions

diff --git a/Android.mk b/Android.mk
index 8739a18..19b5c3d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,11 +28,13 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
 		lib/Target/ARM/AsmParser 	\
 		lib/Target/ARM/InstPrinter \
 		lib/Target/ARM/Disassembler	\
+		lib/Target/ARM/MCTargetDesc \
 		lib/Target/ARM/TargetInfo	\
 		lib/Target/X86	\
 		lib/Target/X86/AsmParser 	\
 		lib/Target/X86/InstPrinter	\
 		lib/Target/X86/Disassembler	\
+		lib/Target/X86/MCTargetDesc \
 		lib/Target/X86/TargetInfo	\
 		lib/Target/X86/Utils	\
 		lib/ExecutionEngine/JIT	\
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 5dbbc17..4da3315 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 arm_codegen_TBLGEN_TABLES :=	\
 	ARMGenAsmWriter.inc	\
 	ARMGenMCCodeEmitter.inc \
+	ARMGenMCPseudoLowering.inc \
 	ARMGenRegisterInfo.inc	\
 	ARMGenInstrInfo.inc	\
 	ARMGenDAGISel.inc	\
@@ -31,7 +32,6 @@ arm_codegen_SRC_FILES :=   \
 	ARMJITInfo.cpp  \
 	ARMLoadStoreOptimizer.cpp   \
 	ARMMachObjectWriter.cpp \
-	ARMMCAsmInfo.cpp    \
 	ARMMCCodeEmitter.cpp\
 	ARMMCExpr.cpp	\
 	ARMMCInstLower.cpp  \
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index d5c9c7b..917a43d 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -4,6 +4,7 @@ arm_disassembler_TBLGEN_TABLES := \
     ARMGenDecoderTables.inc \
     ARMGenEDInfo.inc \
     ARMGenInstrInfo.inc \
+    ARMGenSubtargetInfo.inc \
     ARMGenRegisterInfo.inc
 
 arm_disassembler_SRC_FILES := \
diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index 5ecad8b..fdd8a0e 100644
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 arm_asm_printer_TBLGEN_TABLES :=    \
     ARMGenAsmWriter.inc \
     ARMGenRegisterInfo.inc\
+    ARMGenSubtargetInfo.inc \
     ARMGenInstrInfo.inc
 
 arm_asm_printer_SRC_FILES :=    \
diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
new file mode 100644
index 0000000..fee940e
--- /dev/null
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -0,0 +1,48 @@
+LOCAL_PATH := $(call my-dir)
+
+arm_mc_desc_TBLGEN_TABLES :=	\
+	ARMGenRegisterInfo.inc	\
+	ARMGenInstrInfo.inc	\
+	ARMGenSubtargetInfo.inc
+
+arm_mc_desc_SRC_FILES :=   \
+	ARMMCAsmInfo.cpp \
+	ARMMCTargetDesc.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMARMDesc
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device only
+# =====================================================
+ifeq ($(TARGET_ARCH),arm)
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMARMDesc
+
+LOCAL_MODULE_TAGS := optional
+
+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 a03fff9..af85496 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 arm_target_info_TBLGEN_TABLES :=	\
+	ARMGenSubtargetInfo.inc \
 	ARMGenRegisterInfo.inc	\
 	ARMGenInstrInfo.inc
 
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 537e462..9a86718 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -25,7 +25,6 @@ x86_codegen_SRC_FILES :=	\
     X86InstrInfo.cpp	\
     X86JITInfo.cpp	\
     X86MachObjectWriter.cpp \
-    X86MCAsmInfo.cpp	\
     X86MCCodeEmitter.cpp	\
     X86MCInstLower.cpp	\
     X86RegisterInfo.cpp	\
diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index 70b88f8..13da039 100644
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -1,36 +1,48 @@
-#LOCAL_PATH := $(call my-dir)
-#
-#x86_codegen_SRC_FILES :=	\
-#	X86TargetDesc.cpp
-#
-## For the host
-## =====================================================
-#include $(CLEAR_VARS)
-#include $(CLEAR_TBLGEN_VARS)
-#
-#TBLGEN_TABLES := $(x86_codegen_TBLGEN_TABLES)
-#
-#LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
-#
-#LOCAL_MODULE:= libLLVMX86Desc
-#
-#LOCAL_MODULE_TAGS := optional
-#
-#include $(LLVM_HOST_BUILD_MK)
-#include $(BUILD_HOST_STATIC_LIBRARY)
-#
-## For the device only
-## =====================================================
-#ifeq ($(TARGET_ARCH),x86)
-#include $(CLEAR_VARS)
-#include $(CLEAR_TBLGEN_VARS)
-#
-#LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
-#
-#LOCAL_MODULE:= libLLVMX86Desc
-#
-#LOCAL_MODULE_TAGS := optional
-#
-#include $(LLVM_DEVICE_BUILD_MK)
-#include $(BUILD_STATIC_LIBRARY)
-#endif
+LOCAL_PATH := $(call my-dir)
+
+x86_mc_desc_TBLGEN_TABLES :=	\
+	X86GenRegisterInfo.inc	\
+	X86GenInstrInfo.inc	\
+	X86GenSubtargetInfo.inc
+
+x86_mc_desc_SRC_FILES :=   \
+	X86MCAsmInfo.cpp \
+	X86MCTargetDesc.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMX86Desc
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device only
+# =====================================================
+ifeq ($(TARGET_ARCH),x86)
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMX86Desc
+
+LOCAL_MODULE_TAGS := optional
+
+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 5d81f33..1ac0a47 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 x86_target_info_TBLGEN_TABLES :=	\
 	X86GenRegisterInfo.inc	\
+	X86GenSubtargetInfo.inc \
 	X86GenInstrInfo.inc
 
 x86_target_info_SRC_FILES :=	\
diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index b19ef66..3130102 100644
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -4,7 +4,6 @@ transforms_ipo_SRC_FILES :=	\
 	ArgumentPromotion.cpp	\
 	ConstantMerge.cpp	\
 	DeadArgumentElimination.cpp	\
-	DeadTypeElimination.cpp	\
 	ExtractGV.cpp	\
 	FunctionAttrs.cpp	\
 	GlobalDCE.cpp	\
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 93d36e7..3727894 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -16,6 +16,7 @@ transforms_utils_SRC_FILES :=	\
 	Local.cpp	\
 	LoopSimplify.cpp	\
 	LoopUnroll.cpp	\
+	LowerExpectIntrinsic.cpp \
 	LowerInvoke.cpp	\
 	LowerSwitch.cpp	\
 	Mem2Reg.cpp	\
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index 7b99aeb..3c70a0b 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -29,7 +29,6 @@ vmcore_SRC_FILES :=	\
 	PassRegistry.cpp	\
 	PrintModulePass.cpp	\
 	Type.cpp	\
-	TypeSymbolTable.cpp	\
 	Use.cpp	\
 	User.cpp\
 	Value.cpp	\
diff --git a/llvm-tblgen-rules.mk b/llvm-tblgen-rules.mk
index eb14b04..d2cf568 100644
--- a/llvm-tblgen-rules.mk
+++ b/llvm-tblgen-rules.mk
@@ -28,6 +28,28 @@ ifneq ($(TBLGEN_TD_DIR),)
 tblgen_source_dir := $(TBLGEN_TD_DIR)
 endif
 
+#
+# The directory and the .td directory is not the same.
+#
+ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/ARM/MCTargetDesc)
+$(intermediates)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out, register-info)
+$(intermediates)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,instr-info)
+$(intermediates)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,subtarget)
+endif
+
+ifeq ($(tblgen_source_dir),$(LLVM_ROOT_PATH)/lib/Target/X86/MCTargetDesc)
+$(intermediates)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out, register-info)
+$(intermediates)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,instr-info)
+$(intermediates)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td $(TBLGEN)
+	$(call transform-td-to-out,subtarget)
+endif
+
+
 ifneq ($(filter %GenRegisterInfo.inc,$(tblgen_gen_tables)),)
 $(intermediates)/%GenRegisterInfo.inc: $(tblgen_source_dir)/%.td $(TBLGEN)
 	$(call transform-td-to-out,register-info)
@@ -63,6 +85,11 @@ $(intermediates)/%GenMCCodeEmitter.inc: $(tblgen_source_dir)/%.td $(TBLGEN)
 	$(call transform-td-to-out,emitter -mc-emitter)
 endif
 
+ifneq ($(filter %GenMCPseudoLowering.inc,$(tblgen_gen_tables)),)
+$(intermediates)/%GenMCPseudoLowering.inc: $(tblgen_source_dir)/%.td $(TBLGEN)
+	$(call transform-td-to-out,pseudo-lowering)
+endif
+
 ifneq ($(filter %GenDAGISel.inc,$(tblgen_gen_tables)),)
 $(intermediates)/%GenDAGISel.inc: $(tblgen_source_dir)/%.td $(TBLGEN)
 	$(call transform-td-to-out,dag-isel)
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 18cf7e8..ac5e162 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES :=	\
 	LLVMCConfigurationEmitter.cpp   \
 	NeonEmitter.cpp	\
 	OptParserEmitter.cpp    \
+	PseudoLoweringEmitter.cpp \
 	Record.cpp  \
 	RegisterInfoEmitter.cpp \
 	SetTheory.cpp \