Update aosp/master LLVM for rebase to r256229

[android-x86/external-llvm.git] / lib / Target / X86 / Android.mk

diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index f159bb2..4cd4a58 100644 (file)
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,8 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 
 x86_codegen_TBLGEN_TABLES := \
+  X86GenAsmMatcher.inc \
   X86GenAsmWriter.inc \
   X86GenAsmWriter1.inc \
+  X86GenDisassemblerTables.inc \
   X86GenRegisterInfo.inc \
   X86GenInstrInfo.inc \
   X86GenDAGISel.inc \
@@ -12,17 +14,18 @@ x86_codegen_TBLGEN_TABLES := \
 
 x86_codegen_SRC_FILES := \
   X86AsmPrinter.cpp \
-  X86COFFMachineModuleInfo.cpp \
-  X86CodeEmitter.cpp \
+  X86CallFrameOptimization.cpp \
+  X86ExpandPseudo.cpp \
   X86FastISel.cpp \
+  X86FixupLEAs.cpp \
   X86FloatingPoint.cpp \
   X86FrameLowering.cpp \
   X86ISelDAGToDAG.cpp \
   X86ISelLowering.cpp \
   X86InstrInfo.cpp \
-  X86JITInfo.cpp \
   X86MachineFunctionInfo.cpp \
   X86MCInstLower.cpp \
+  X86OptimizeLEAs.cpp \
   X86PadShortFunction.cpp \
   X86RegisterInfo.cpp \
   X86SelectionDAGInfo.cpp \
@@ -30,7 +33,8 @@ x86_codegen_SRC_FILES := \
   X86TargetMachine.cpp \
   X86TargetObjectFile.cpp \
   X86TargetTransformInfo.cpp \
-  X86VZeroUpper.cpp
+  X86VZeroUpper.cpp \
+  X86WinEHState.cpp
 
 # For the host
 # =====================================================
@@ -43,16 +47,17 @@ 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)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
-ifeq ($(TARGET_ARCH),x86)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
@@ -62,10 +67,9 @@ 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_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif