4 files changed, 59 insertions, 59 deletions
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 9a86718..8432ad9 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,37 +1,34 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_codegen_TBLGEN_TABLES :=	\
-    X86GenAsmWriter.inc \
-    X86GenAsmWriter1.inc \
-    X86GenRegisterInfo.inc	\
-    X86GenInstrInfo.inc	\
-    X86GenDAGISel.inc	\
-    X86GenFastISel.inc	\
-    X86GenSubtargetInfo.inc	\
-    X86GenCallingConv.inc
+x86_codegen_TBLGEN_TABLES := \
+  X86GenAsmWriter.inc \
+  X86GenAsmWriter1.inc \
+  X86GenRegisterInfo.inc \
+  X86GenInstrInfo.inc \
+  X86GenDAGISel.inc \
+  X86GenFastISel.inc \
+  X86GenSubtargetInfo.inc \
+  X86GenCallingConv.inc
 
-x86_codegen_SRC_FILES :=	\
-    SSEDomainFix.cpp	\
-    X86AsmBackend.cpp	\
-    X86AsmPrinter.cpp	\
-    X86COFFMachineModuleInfo.cpp	\
-    X86CodeEmitter.cpp	\
-    X86ELFWriterInfo.cpp	\
-    X86FastISel.cpp	\
-    X86FloatingPoint.cpp\
-    X86FrameLowering.cpp\
-    X86ISelDAGToDAG.cpp	\
-    X86ISelLowering.cpp	\
-    X86InstrInfo.cpp	\
-    X86JITInfo.cpp	\
-    X86MachObjectWriter.cpp \
-    X86MCCodeEmitter.cpp	\
-    X86MCInstLower.cpp	\
-    X86RegisterInfo.cpp	\
-    X86SelectionDAGInfo.cpp	\
-    X86Subtarget.cpp	\
-    X86TargetMachine.cpp	\
-    X86TargetObjectFile.cpp
+x86_codegen_SRC_FILES := \
+  X86AsmPrinter.cpp \
+  X86COFFMachineModuleInfo.cpp \
+  X86CodeEmitter.cpp \
+  X86ELFWriterInfo.cpp \
+  X86FastISel.cpp \
+  X86FloatingPoint.cpp \
+  X86FrameLowering.cpp \
+  X86ISelDAGToDAG.cpp \
+  X86ISelLowering.cpp \
+  X86InstrInfo.cpp \
+  X86JITInfo.cpp \
+  X86MCInstLower.cpp \
+  X86RegisterInfo.cpp \
+  X86SelectionDAGInfo.cpp \
+  X86Subtarget.cpp \
+  X86TargetMachine.cpp \
+  X86TargetObjectFile.cpp \
+  X86VZeroUpper.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 69d3435..e631db6 100644
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -1,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 
 x86_disassembler_TBLGEN_TABLES := \
-	X86GenDisassemblerTables.inc	\
-	X86GenEDInfo.inc	\
-	X86GenRegisterInfo.inc
+  X86GenDisassemblerTables.inc \
+  X86GenEDInfo.inc \
+  X86GenInstrInfo.inc \
+  X86GenRegisterInfo.inc
 
 x86_disassembler_SRC_FILES := \
-	X86Disassembler.cpp	\
-	X86DisassemblerDecoder.c
+  X86Disassembler.cpp \
+  X86DisassemblerDecoder.c
 
 # For the device
 # =====================================================
diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index 13da039..f50d081 100644
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -1,27 +1,29 @@
 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
+x86_mc_desc_TBLGEN_TABLES := \
+  X86GenRegisterInfo.inc \
+  X86GenInstrInfo.inc \
+  X86GenSubtargetInfo.inc
+
+x86_mc_desc_SRC_FILES := \
+  X86AsmBackend.cpp \
+  X86MCTargetDesc.cpp \
+  X86MCAsmInfo.cpp \
+  X86MCCodeEmitter.cpp \
+  X86MachObjectWriter.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
 
+LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
+
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -33,14 +35,14 @@ 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
 
+LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
+
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 1ac0a47..c72b383 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -1,12 +1,12 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_target_info_TBLGEN_TABLES :=	\
-	X86GenRegisterInfo.inc	\
-	X86GenSubtargetInfo.inc \
-	X86GenInstrInfo.inc
+x86_target_info_TBLGEN_TABLES := \
+  X86GenRegisterInfo.inc \
+  X86GenSubtargetInfo.inc \
+  X86GenInstrInfo.inc
 
-x86_target_info_SRC_FILES :=	\
-	X86TargetInfo.cpp
+x86_target_info_SRC_FILES := \
+  X86TargetInfo.cpp
 
 # For the host
 # =====================================================