6 files changed, 14 insertions, 20 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp
index 7ed07c2..2afbb77 100644
--- a/lib/Target/ARM/ARMCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMCodeEmitter.cpp
@@ -272,10 +272,10 @@ namespace {
 
     unsigned getHiLo16ImmOpValue(const MachineInstr &MI, unsigned Op)
       const {
-      const TargetInstrDesc &TID = MI.getDesc();
+      const MCInstrDesc &MCID = MI.getDesc();
       const MachineOperand &MO = MI.getOperand(Op);
 
-      unsigned Reloc = (TID.Opcode == ARM::MOVi16 ?
+      unsigned Reloc = (MCID.Opcode == ARM::MOVi16 ?
                        ARM::reloc_arm_movw : ARM::reloc_arm_movt);
 
       if (!MO.isImm()) {
@@ -803,7 +803,7 @@ void ARMCodeEmitter::emitMOVi2piecesInstruction(const MachineInstr &MI) {
 
 void ARMCodeEmitter::emitLEApcrelInstruction(const MachineInstr &MI) {
   // It's basically add r, pc, (LCPI - $+8)
-  const TargetInstrDesc &TID = MI.getDesc();
+  const MCInstrDesc &MCID = MI.getDesc();
 
   unsigned Binary = 0;
 
@@ -811,7 +811,7 @@ void ARMCodeEmitter::emitLEApcrelInstruction(const MachineInstr &MI) {
   Binary |= II->getPredicate(&MI) << ARMII::CondShift;
 
   // Encode S bit if MI modifies CPSR.
-  Binary |= getAddrModeSBit(MI, TID);
+  Binary |= getAddrModeSBit(MI, MCID);
 
   // Encode Rd.
   Binary |= getMachineOpValue(MI, 0) << ARMII::RegRdShift;
@@ -1086,7 +1086,7 @@ void ARMCodeEmitter::emitDataProcessingInstruction(const MachineInstr &MI,
   // Part of binary is determined by TableGn.
   unsigned Binary = getBinaryCodeForInstr(MI);
 
-  if (TID.Opcode == ARM::MOVi16 || TID.Opcode == ARM::MOVTi16) {
+  if (MCID.Opcode == ARM::MOVi16 || MCID.Opcode == ARM::MOVTi16) {
       emitWordLE(Binary);
       return;
   }
@@ -1359,7 +1359,7 @@ void ARMCodeEmitter::emitLoadStoreMultipleInstruction(const MachineInstr &MI) {
   // Part of binary is determined by TableGn.
   unsigned Binary = getBinaryCodeForInstr(MI);
 
-  if (TID.getOpcode() == ARM::LDMIA_RET) {
+  if (MCID.getOpcode() == ARM::LDMIA_RET) {
     IsUpdating = true;
     Binary |= 0x8B00000;
   }
@@ -1571,7 +1571,7 @@ void ARMCodeEmitter::emitBranchInstruction(const MachineInstr &MI) {
   // Part of binary is determined by TableGn.
   unsigned Binary = getBinaryCodeForInstr(MI);
 
-  if (TID.Opcode == ARM::B) {
+  if (MCID.Opcode == ARM::B) {
     Binary = 0xEA000000;
   }
 
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 1223599..91d84cc 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -3,10 +3,7 @@ LOCAL_PATH := $(call my-dir)
 arm_codegen_TBLGEN_TABLES :=	\
 	ARMGenAsmWriter.inc	\
 	ARMGenMCCodeEmitter.inc \
-	ARMGenRegisterInfo.h.inc\
-	ARMGenRegisterNames.inc	\
 	ARMGenRegisterInfo.inc	\
-	ARMGenInstrNames.inc	\
 	ARMGenInstrInfo.inc	\
 	ARMGenDAGISel.inc	\
 	ARMGenFastISel.inc	\
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index 552dedd..664de6c 100644
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -6,9 +6,8 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 TBLGEN_TABLES :=	\
-	ARMGenInstrNames.inc	\
-	ARMGenRegisterNames.inc	\
-	ARMGenRegisterInfo.h.inc \
+	ARMGenInstrInfo.inc	\
+	ARMGenRegisterInfo.inc \
 	ARMGenAsmMatcher.inc
 
 
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 0e3c32c..d5c9c7b 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -3,10 +3,8 @@ LOCAL_PATH := $(call my-dir)
 arm_disassembler_TBLGEN_TABLES := \
     ARMGenDecoderTables.inc \
     ARMGenEDInfo.inc \
-    ARMGenInstrNames.inc \
     ARMGenInstrInfo.inc \
-    ARMGenRegisterNames.inc \
-    ARMGenRegisterInfo.h.inc
+    ARMGenRegisterInfo.inc
 
 arm_disassembler_SRC_FILES := \
     ARMDisassembler.cpp \
diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index 3a35023..5ecad8b 100644
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 arm_asm_printer_TBLGEN_TABLES :=    \
     ARMGenAsmWriter.inc \
-    ARMGenRegisterNames.inc\
-    ARMGenInstrNames.inc
+    ARMGenRegisterInfo.inc\
+    ARMGenInstrInfo.inc
 
 arm_asm_printer_SRC_FILES :=    \
     ARMInstPrinter.cpp
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index e07da39..a03fff9 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 
 arm_target_info_TBLGEN_TABLES :=	\
-	ARMGenRegisterNames.inc	\
-	ARMGenInstrNames.inc
+	ARMGenRegisterInfo.inc	\
+	ARMGenInstrInfo.inc
 
 arm_target_info_SRC_FILES :=	\
 	ARMTargetInfo.cpp