DO NOT MERGE: android: translate Android.mk build rules for libLLVM80

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

diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index 25e30ed..84cc6ce 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_mc_desc_TBLGEN_TABLES := \
+x86_mc_desc_TBLGEN_TABLES80 := \
   X86GenRegisterInfo.inc \
   X86GenInstrInfo.inc \
   X86GenSubtargetInfo.inc
@@ -12,43 +12,44 @@ x86_mc_desc_SRC_FILES := \
   X86MCCodeEmitter.cpp \
   X86MachObjectWriter.cpp \
   X86ELFObjectWriter.cpp \
+  X86WinCOFFObjectWriter.cpp \
   X86WinCOFFStreamer.cpp \
-  X86WinCOFFObjectWriter.cpp
+  X86WinCOFFTargetStreamer.cpp
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVMX86Desc
+LOCAL_MODULE:= libLLVM80X86Desc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(x86_mc_desc_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
+include $(CLEAR_TBLGEN_VARS80)
 
 
-LOCAL_MODULE:= libLLVMX86Desc
+LOCAL_MODULE:= libLLVM80X86Desc
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(x86_mc_desc_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif