Index: llvm/trunk/lib/Target/ARM/ARMInstrThumb.td
===================================================================
--- llvm/trunk/lib/Target/ARM/ARMInstrThumb.td
+++ llvm/trunk/lib/Target/ARM/ARMInstrThumb.td
@@ -997,6 +997,9 @@
   }
 }
 
+def : tInstAlias <"add${s}${p} $Rdn, $Rm",
+                 (tADDrr tGPR:$Rdn,s_cc_out:$s, tGPR:$Rdn, tGPR:$Rm, pred:$p)>;
+
 def : tInstSubst<"sub${s}${p} $rd, $rn, $imm",
                  (tADDi3 tGPR:$rd, s_cc_out:$s, tGPR:$rn, mod_imm1_7_neg:$imm, pred:$p)>;
 def : tInstSubst<"sub${s}${p} $rdn, $imm",
@@ -1286,6 +1289,9 @@
                 [(set tGPR:$Rd, (sub tGPR:$Rn, tGPR:$Rm))]>,
                 Sched<[WriteALU]>;
 
+def : tInstAlias <"sub${s}${p} $Rdn, $Rm",
+                 (tSUBrr tGPR:$Rdn,s_cc_out:$s, tGPR:$Rdn, tGPR:$Rm, pred:$p)>;
+
 /// Similar to the above except these set the 's' bit so the
 /// instruction modifies the CPSR register.
 ///
Index: llvm/trunk/test/MC/ARM/implicit-it-generation.s
===================================================================
--- llvm/trunk/test/MC/ARM/implicit-it-generation.s
+++ llvm/trunk/test/MC/ARM/implicit-it-generation.s
@@ -394,12 +394,12 @@
   .endr
 @ CHECK: itete eq
 @ CHECK:  addeq r0, r1
-@ CHECK:  subne.w r0, r0, r1
+@ CHECK:  subne r0, r0, r1
 @ CHECK:  addeq r0, r1
-@ CHECK:  subne.w r0, r0, r1
+@ CHECK:  subne r0, r0, r1
 @ CHECK: ite eq
 @ CHECK:  addeq r0, r1
-@ CHECK:  subne.w r0, r0, r1
+@ CHECK:  subne r0, r0, r1
 
 @ Flush at end of file
   .section test99
Index: llvm/trunk/test/MC/ARM/thumb-add-sub-width.s
===================================================================
--- llvm/trunk/test/MC/ARM/thumb-add-sub-width.s
+++ llvm/trunk/test/MC/ARM/thumb-add-sub-width.s
@@ -0,0 +1,70 @@
+// RUN: llvm-mc -triple thumbv6m -show-encoding < %s | FileCheck %s
+
+  .text
+  .thumb
+
+  // Check that the correct encoding of the add and sub instructions is
+  // selected, for all combinations of flag-setting, condition and 2- or
+  // 3-operand syntax.
+
+  .arch armv6-m
+  add r0, r0, r1     // T2
+  add r0, r1         // T2
+  adds r0, r0, r1    // T1
+  adds r0, r1        // T1
+// CHECK: add     r0, r1                  @ encoding: [0x08,0x44]
+// CHECK: add     r0, r1                  @ encoding: [0x08,0x44]
+// CHECK: adds    r0, r0, r1              @ encoding: [0x40,0x18]
+// CHECK: adds    r0, r0, r1              @ encoding: [0x40,0x18]
+
+  .arch armv7-m
+  add r0, r0, r1     // T2, T3
+  add r0, r1         // T2, T3
+  adds r0, r0, r1    // T1, T3
+  adds r0, r1        // T1, T3
+// CHECK: add     r0, r1                  @ encoding: [0x08,0x44]
+// CHECK: add     r0, r1                  @ encoding: [0x08,0x44]
+// CHECK: adds    r0, r0, r1              @ encoding: [0x40,0x18]
+// CHECK: adds    r0, r0, r1              @ encoding: [0x40,0x18]
+
+  itttt eq
+// CHECK: itttt   eq                      @ encoding: [0x01,0xbf]
+  addeq r0, r0, r1   // T1, T2, T3
+  addeq r0, r1       // T2, T1, T3
+  addseq r0, r0, r1  // T3
+  addseq r0, r1      // T3
+  // NOTE: Both T1 and T2 are valid for these two instructions, which one is
+  // the preferred varies depending on whether the 2- or 3-operand syntax was
+  // used.
+// CHECK: addeq   r0, r0, r1              @ encoding: [0x40,0x18]
+// CHECK: addeq   r0, r1                  @ encoding: [0x08,0x44]
+// CHECK: addseq.w        r0, r0, r1      @ encoding: [0x10,0xeb,0x01,0x00]
+// CHECK: addseq.w        r0, r0, r1      @ encoding: [0x10,0xeb,0x01,0x00]
+
+  .arch armv6-m
+  // NOTE: There is no non-flag-setting sub instruction for v6-M
+  subs r0, r0, r1    // T1, T2
+  subs r0, r1        // T1, T2
+// CHECK: subs    r0, r0, r1              @ encoding: [0x40,0x1a]
+// CHECK: subs    r0, r0, r1              @ encoding: [0x40,0x1a]
+
+  .arch armv7-m
+  sub r0, r0, r1     // T2
+  sub r0, r1         // T2
+  subs r0, r0, r1    // T1, T2
+  subs r0, r1        // T1, T2
+// CHECK: sub.w   r0, r0, r1              @ encoding: [0xa0,0xeb,0x01,0x00]
+// CHECK: sub.w   r0, r0, r1              @ encoding: [0xa0,0xeb,0x01,0x00]
+// CHECK: subs    r0, r0, r1              @ encoding: [0x40,0x1a]
+// CHECK: subs    r0, r0, r1              @ encoding: [0x40,0x1a]
+
+  itttt eq
+// CHECK: itttt   eq                      @ encoding: [0x01,0xbf]
+  subeq r0, r0, r1   // T1, T2
+  subeq r0, r1       // T1, T2
+  subseq r0, r0, r1  // T2
+  subseq r0, r1      // T2
+// CHECK: subeq   r0, r0, r1              @ encoding: [0x40,0x1a]
+// CHECK: subeq   r0, r0, r1              @ encoding: [0x40,0x1a]
+// CHECK: subseq.w        r0, r0, r1      @ encoding: [0xb0,0xeb,0x01,0x00]
+// CHECK: subseq.w        r0, r0, r1      @ encoding: [0xb0,0xeb,0x01,0x00]