aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/ARM
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Target/ARM')
-rw-r--r--lib/Target/ARM/Android.mk113
-rw-r--r--lib/Target/ARM/Disassembler/Android.mk13
-rw-r--r--lib/Target/ARM/InstPrinter/Android.mk16
-rw-r--r--lib/Target/ARM/MCTargetDesc/Android.mk40
-rw-r--r--lib/Target/ARM/TargetInfo/Android.mk12
5 files changed, 98 insertions, 96 deletions
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 4da3315..f49d257 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,69 +1,65 @@
LOCAL_PATH := $(call my-dir)
-arm_codegen_TBLGEN_TABLES := \
- ARMGenAsmWriter.inc \
- ARMGenMCCodeEmitter.inc \
- ARMGenMCPseudoLowering.inc \
- ARMGenRegisterInfo.inc \
- ARMGenInstrInfo.inc \
- ARMGenDAGISel.inc \
- ARMGenFastISel.inc \
- ARMGenSubtargetInfo.inc \
- ARMGenCodeEmitter.inc \
- ARMGenCallingConv.inc
+arm_codegen_TBLGEN_TABLES := \
+ ARMGenRegisterInfo.inc \
+ ARMGenInstrInfo.inc \
+ ARMGenCodeEmitter.inc \
+ ARMGenMCCodeEmitter.inc \
+ ARMGenMCPseudoLowering.inc \
+ ARMGenAsmWriter.inc \
+ ARMGenAsmMatcher.inc \
+ ARMGenDAGISel.inc \
+ ARMGenFastISel.inc \
+ ARMGenCallingConv.inc \
+ ARMGenSubtargetInfo.inc \
+ ARMGenEDInfo.inc \
+ ARMGenDisassemblerTables.inc
-arm_codegen_SRC_FILES := \
- ARMAsmBackend.cpp \
- ARMAsmPrinter.cpp \
- ARMBaseInstrInfo.cpp \
- ARMBaseRegisterInfo.cpp \
- ARMCodeEmitter.cpp \
- ARMConstantIslandPass.cpp \
- ARMConstantPoolValue.cpp \
- ARMELFWriterInfo.cpp \
- ARMExpandPseudoInsts.cpp \
- ARMFastISel.cpp \
- ARMFrameLowering.cpp \
- ARMGlobalMerge.cpp \
- ARMHazardRecognizer.cpp \
- ARMISelDAGToDAG.cpp \
- ARMISelLowering.cpp \
- ARMInstrInfo.cpp \
- ARMJITInfo.cpp \
- ARMLoadStoreOptimizer.cpp \
- ARMMachObjectWriter.cpp \
- ARMMCCodeEmitter.cpp\
- ARMMCExpr.cpp \
- ARMMCInstLower.cpp \
- ARMRegisterInfo.cpp \
- ARMSelectionDAGInfo.cpp \
- ARMSubtarget.cpp \
- ARMTargetMachine.cpp \
- ARMTargetObjectFile.cpp \
- InstPrinter/ARMInstPrinter.cpp \
- MLxExpansionPass.cpp \
- NEONMoveFix.cpp \
- Thumb1FrameLowering.cpp \
- Thumb1InstrInfo.cpp \
- Thumb1RegisterInfo.cpp \
- Thumb2ITBlockPass.cpp \
- Thumb2InstrInfo.cpp \
- Thumb2RegisterInfo.cpp \
- Thumb2SizeReduction.cpp
+arm_codegen_SRC_FILES := \
+ ARMAsmPrinter.cpp \
+ ARMBaseInstrInfo.cpp \
+ ARMBaseRegisterInfo.cpp \
+ ARMCodeEmitter.cpp \
+ ARMConstantIslandPass.cpp \
+ ARMConstantPoolValue.cpp \
+ ARMELFWriterInfo.cpp \
+ ARMExpandPseudoInsts.cpp \
+ ARMFastISel.cpp \
+ ARMFrameLowering.cpp \
+ ARMHazardRecognizer.cpp \
+ ARMISelDAGToDAG.cpp \
+ ARMISelLowering.cpp \
+ ARMInstrInfo.cpp \
+ ARMJITInfo.cpp \
+ ARMLoadStoreOptimizer.cpp \
+ ARMMCInstLower.cpp \
+ ARMRegisterInfo.cpp \
+ ARMSelectionDAGInfo.cpp \
+ ARMSubtarget.cpp \
+ ARMTargetMachine.cpp \
+ ARMTargetObjectFile.cpp \
+ InstPrinter/ARMInstPrinter.cpp \
+ MLxExpansionPass.cpp \
+ Thumb1FrameLowering.cpp \
+ Thumb1InstrInfo.cpp \
+ Thumb1RegisterInfo.cpp \
+ Thumb2ITBlockPass.cpp \
+ Thumb2InstrInfo.cpp \
+ Thumb2RegisterInfo.cpp \
+ Thumb2SizeReduction.cpp
# For the host
# =====================================================
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
-TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
-
-LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
-
LOCAL_MODULE:= libLLVMARMCodeGen
-
LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
+TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
+
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
@@ -75,14 +71,13 @@ ifeq ($(TARGET_ARCH),arm)
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
-TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
-
-LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
-
LOCAL_MODULE:= libLLVMARMCodeGen
-
LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
+TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
+
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 917a43d..fb14762 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -1,15 +1,14 @@
LOCAL_PATH := $(call my-dir)
arm_disassembler_TBLGEN_TABLES := \
- ARMGenDecoderTables.inc \
- ARMGenEDInfo.inc \
- ARMGenInstrInfo.inc \
- ARMGenSubtargetInfo.inc \
- ARMGenRegisterInfo.inc
+ ARMGenDisassemblerTables.inc \
+ ARMGenEDInfo.inc \
+ ARMGenInstrInfo.inc \
+ ARMGenSubtargetInfo.inc \
+ ARMGenRegisterInfo.inc
arm_disassembler_SRC_FILES := \
- ARMDisassembler.cpp \
- ARMDisassemblerCore.cpp
+ ARMDisassembler.cpp
# For the device
# =====================================================
diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index fdd8a0e..a047f6f 100644
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -1,13 +1,13 @@
LOCAL_PATH := $(call my-dir)
-arm_asm_printer_TBLGEN_TABLES := \
- ARMGenAsmWriter.inc \
- ARMGenRegisterInfo.inc\
- ARMGenSubtargetInfo.inc \
- ARMGenInstrInfo.inc
-
-arm_asm_printer_SRC_FILES := \
- ARMInstPrinter.cpp
+arm_asm_printer_TBLGEN_TABLES := \
+ ARMGenAsmWriter.inc \
+ ARMGenRegisterInfo.inc \
+ ARMGenSubtargetInfo.inc \
+ ARMGenInstrInfo.inc
+
+arm_asm_printer_SRC_FILES := \
+ ARMInstPrinter.cpp
# For the host
# =====================================================
diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index fee940e..3365b2c 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -1,27 +1,34 @@
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
+arm_mc_desc_TBLGEN_TABLES := \
+ ARMGenRegisterInfo.inc \
+ ARMGenInstrInfo.inc \
+ ARMGenMCCodeEmitter.inc \
+ ARMGenSubtargetInfo.inc
+
+arm_mc_desc_SRC_FILES := \
+ ARMAsmBackend.cpp \
+ ARMMCAsmInfo.cpp \
+ ARMMCCodeEmitter.cpp \
+ ARMMCExpr.cpp \
+ ARMMCTargetDesc.cpp \
+ ARMMachObjectWriter.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
+LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
+
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
@@ -33,13 +40,14 @@ ifeq ($(TARGET_ARCH),arm)
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
-TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
+LOCAL_MODULE:= libLLVMARMDesc
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_MODULE:= libLLVMARMDesc
-
-LOCAL_MODULE_TAGS := optional
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index af85496..d1af6ae 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,12 +1,12 @@
LOCAL_PATH := $(call my-dir)
-arm_target_info_TBLGEN_TABLES := \
- ARMGenSubtargetInfo.inc \
- ARMGenRegisterInfo.inc \
- ARMGenInstrInfo.inc
+arm_target_info_TBLGEN_TABLES := \
+ ARMGenSubtargetInfo.inc \
+ ARMGenRegisterInfo.inc \
+ ARMGenInstrInfo.inc
-arm_target_info_SRC_FILES := \
- ARMTargetInfo.cpp
+arm_target_info_SRC_FILES := \
+ ARMTargetInfo.cpp
# For the host
# =====================================================