svn commit: r271030 - head/contrib/llvm/lib/Target/ARM

[Sean Bruno]

Author: sbruno
Date: Wed Sep  3 15:48:07 2014
New Revision: 271030
URL: http://svnweb.freebsd.org/changeset/base/271030

Log:
  Apparently, the patch commited in svn r271029 doesn't actually do anyting,
  so we still need to modify the code in place. Pointed out by emaste.
  
  MFC after:	2 days
  Relnotes:	yes

Modified:
  head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td

Modified: head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
==============================================================================
--- head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td	Wed Sep  3 15:32:38 2014	(r271029)
+++ head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td	Wed Sep  3 15:48:07 2014	(r271030)
@@ -3248,7 +3248,8 @@ def : ARMPat<(ARMaddc GPR:$src, imm0_655
 def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR),
              (SBCri   GPR:$src, so_imm_not:$imm)>;
 def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR),
-             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>;
+             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>,
+             Requires<[IsARM, HasV6T2]>;
 
 // Note: These are implemented in C++ code, because they have to generate
 // ADD/SUBrs instructions, which use a complex pattern that a xform function