diff --git a/utils/TableGen/NeonEmitter.cpp b/utils/TableGen/NeonEmitter.cpp
index c7b3ec55a69..7a623583f3a 100644
--- a/utils/TableGen/NeonEmitter.cpp
+++ b/utils/TableGen/NeonEmitter.cpp
@@ -584,9 +584,23 @@ static std::string GenOpString(OpKind op, const std::string &proto,
   case OpAdd:
     s += "__a + __b;";
     break;
+  case OpAddl:
+    s += Extend(proto, typestr, "__a") + " + "
+      + Extend(proto, typestr, "__b") + ";";
+    break;
+  case OpAddw:
+    s += "__a + " + Extend(proto, typestr, "__b") + ";";
+    break;
   case OpSub:
     s += "__a - __b;";
     break;
+  case OpSubl:
+    s += Extend(proto, typestr, "__a") + " - "
+      + Extend(proto, typestr, "__b") + ";";
+    break;
+  case OpSubw:
+    s += "__a - " + Extend(proto, typestr, "__b") + ";";
+    break;
   case OpMulN:
     s += "__a * " + Duplicate(nElts, typestr, "__b") + ";";
     break;
diff --git a/utils/TableGen/NeonEmitter.h b/utils/TableGen/NeonEmitter.h
index 4c5889388ba..6c0937b3579 100644
--- a/utils/TableGen/NeonEmitter.h
+++ b/utils/TableGen/NeonEmitter.h
@@ -24,7 +24,11 @@
 enum OpKind {
   OpNone,
   OpAdd,
+  OpAddl,
+  OpAddw,
   OpSub,
+  OpSubl,
+  OpSubw,
   OpMul,
   OpMull,
   OpMla,
@@ -87,7 +91,11 @@ namespace llvm {
     NeonEmitter(RecordKeeper &R) : Records(R) {
       OpMap["OP_NONE"]  = OpNone;
       OpMap["OP_ADD"]   = OpAdd;
+      OpMap["OP_ADDL"]  = OpAddl;
+      OpMap["OP_ADDW"]  = OpAddw;
       OpMap["OP_SUB"]   = OpSub;
+      OpMap["OP_SUBL"]  = OpSubl;
+      OpMap["OP_SUBW"]  = OpSubw;
       OpMap["OP_MUL"]   = OpMul;
       OpMap["OP_MULL"]  = OpMull;
       OpMap["OP_MLA"]   = OpMla;