diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 4b21cc6d85b..7c34b58ec20 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -857,8 +857,11 @@ bool ARMAsmParser::ParseInstruction(StringRef Name, SMLoc NameLoc,
   }
 
   Operands.push_back(ARMOperand::CreateToken(Head, NameLoc));
-  // FIXME: Should only add this operand for predicated instructions
-  Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC), NameLoc));
+
+  if (Head != "trap")
+    // FIXME: Should only add this operand for predicated instructions
+    Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC),
+                                                  NameLoc));
 
   // Add the remaining tokens in the mnemonic.
   while (Next != StringRef::npos) {