diff --git a/llvm/lib/Target/XCore/CMakeLists.txt b/llvm/lib/Target/XCore/CMakeLists.txt
--- a/llvm/lib/Target/XCore/CMakeLists.txt
+++ b/llvm/lib/Target/XCore/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 tablegen(LLVM XCoreGenAsmWriter.inc -gen-asm-writer)
 tablegen(LLVM XCoreGenCallingConv.inc -gen-callingconv)
-tablegen(LLVM XCoreGenDAGISel.inc -gen-dag-isel)
+tablegen(LLVM XCoreGenDAGISel.inc -gen-dag-isel -warn-on-unused-entities)
 tablegen(LLVM XCoreGenDisassemblerTables.inc -gen-disassembler)
 tablegen(LLVM XCoreGenInstrInfo.inc -gen-instr-info)
 tablegen(LLVM XCoreGenRegisterInfo.inc -gen-register-info)
diff --git a/llvm/lib/Target/XCore/XCoreInstrInfo.td b/llvm/lib/Target/XCore/XCoreInstrInfo.td
--- a/llvm/lib/Target/XCore/XCoreInstrInfo.td
+++ b/llvm/lib/Target/XCore/XCoreInstrInfo.td
@@ -241,17 +241,6 @@
        !strconcat(OpcStr, " $dst, $b, $c"), []>;
 // Three operand long
 
-/// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot.
-multiclass FL3R_L2RUS<bits<9> opc1, bits<9> opc2, string OpcStr,
-                      SDNode OpNode> {
-  def _l3r: _FL3R<opc1, (outs GRRegs:$dst), (ins GRRegs:$b, GRRegs:$c),
-                  !strconcat(OpcStr, " $dst, $b, $c"),
-                  [(set GRRegs:$dst, (OpNode GRRegs:$b, GRRegs:$c))]>;
-  def _l2rus : _FL2RUS<opc2, (outs GRRegs:$dst), (ins GRRegs:$b, i32imm:$c),
-                       !strconcat(OpcStr, " $dst, $b, $c"),
-                       [(set GRRegs:$dst, (OpNode GRRegs:$b, immUs:$c))]>;
-}
-
 /// FL3R_L2RUS multiclass - Define a normal FL3R/FL2RUS pattern in one shot.
 multiclass FL3R_L2RBITP<bits<9> opc1, bits<9> opc2, string OpcStr,
                         SDNode OpNode> {
@@ -305,14 +294,6 @@
   def _lu6: _FLU6<opc, (outs), (ins i32imm:$a), !strconcat(OpcStr, " $a"), []>;
 }
 
-// Two operand short
-
-class F2R_np<bits<6> opc, string OpcStr> :
-  _F2R<opc, (outs GRRegs:$dst), (ins GRRegs:$b),
-       !strconcat(OpcStr, " $dst, $b"), []>;
-
-// Two operand long
-
 //===----------------------------------------------------------------------===//
 // Pseudo Instructions
 //===----------------------------------------------------------------------===//