8 files changed, 101 insertions, 38 deletions
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 :=	\