diff --git a/llvm/lib/Target/MSP430/CMakeLists.txt b/llvm/lib/Target/MSP430/CMakeLists.txt
--- a/llvm/lib/Target/MSP430/CMakeLists.txt
+++ b/llvm/lib/Target/MSP430/CMakeLists.txt
@@ -5,7 +5,7 @@
 tablegen(LLVM MSP430GenAsmMatcher.inc -gen-asm-matcher)
 tablegen(LLVM MSP430GenAsmWriter.inc -gen-asm-writer)
 tablegen(LLVM MSP430GenCallingConv.inc -gen-callingconv)
-tablegen(LLVM MSP430GenDAGISel.inc -gen-dag-isel)
+tablegen(LLVM MSP430GenDAGISel.inc -gen-dag-isel -warn-on-unused-entities)
 tablegen(LLVM MSP430GenDisassemblerTables.inc -gen-disassembler)
 tablegen(LLVM MSP430GenInstrInfo.inc -gen-instr-info)
 tablegen(LLVM MSP430GenMCCodeEmitter.inc -gen-emitter)
diff --git a/llvm/lib/Target/MSP430/MSP430InstrFormats.td b/llvm/lib/Target/MSP430/MSP430InstrFormats.td
--- a/llvm/lib/Target/MSP430/MSP430InstrFormats.td
+++ b/llvm/lib/Target/MSP430/MSP430InstrFormats.td
@@ -345,27 +345,6 @@
   let Inst{31-16} = src{19-4};
 }
 
-class II8i<bits<3> opcode,
-           dag outs, dag ins, string asmstr, list<dag> pattern>
-  : IIForm8<opcode, SrcImm, 4, outs, ins, asmstr, pattern> {
-  bits<16> imm;
-  let rs = 0b0000;
-  let Inst{31-16} = imm;
-}
-
-class II8c<bits<3> opcode,
-           dag outs, dag ins, string asmstr, list<dag> pattern>
-  : MSP430Inst<outs, ins, 2, asmstr> {
-  let Pattern = pattern;
-
-  bits<6> imm;
-
-  let Inst{15-10} = 0b000100;
-  let Inst{9-7}   = opcode;
-  let Inst{6}     = 1;
-  let Inst{5-0}   = imm;
-}
-
 class II8n<bits<3> opcode,
            dag outs, dag ins, string asmstr, list<dag> pattern>
   : IIForm8<opcode, SrcIndReg, 2, outs, ins, asmstr, pattern>;
diff --git a/llvm/lib/Target/MSP430/MSP430InstrInfo.td b/llvm/lib/Target/MSP430/MSP430InstrInfo.td
--- a/llvm/lib/Target/MSP430/MSP430InstrInfo.td
+++ b/llvm/lib/Target/MSP430/MSP430InstrInfo.td
@@ -12,12 +12,6 @@
 
 include "MSP430InstrFormats.td"
 
-//===----------------------------------------------------------------------===//
-// Type Constraints.
-//===----------------------------------------------------------------------===//
-class SDTCisI8<int OpNum> : SDTCisVT<OpNum, i8>;
-class SDTCisI16<int OpNum> : SDTCisVT<OpNum, i16>;
-
 //===----------------------------------------------------------------------===//
 // Type Profiles.
 //===----------------------------------------------------------------------===//