diff options
| author | Logan Chien <loganchien@google.com> | 2011-10-21 14:45:53 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-10-21 14:45:53 +0800 |
| commit | 2e5a5ee613fae456a8ed4282acede56860682f4f (patch) | |
| tree | 39ebff118a152d71b4d602fe548ebb3b6cacd9af /lib/Target/X86/MCTargetDesc | |
| parent | 0ebc07a576037e4e36f68bf5cece32740ca120c0 (diff) | |
| download | external_llvm-2e5a5ee613fae456a8ed4282acede56860682f4f.zip external_llvm-2e5a5ee613fae456a8ed4282acede56860682f4f.tar.gz external_llvm-2e5a5ee613fae456a8ed4282acede56860682f4f.tar.bz2 | |
Apply changes to migrate to upstream Oct 20th 2011.
Change-Id: I2bb819151f3fa5ce18690ef373bf071205d3f278
Diffstat (limited to 'lib/Target/X86/MCTargetDesc')
| -rw-r--r-- | lib/Target/X86/MCTargetDesc/Android.mk | 36 |
1 files changed, 19 insertions, 17 deletions
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) |