diff --git a/llvm/include/llvm/CodeGen/ValueTypes.h b/llvm/include/llvm/CodeGen/ValueTypes.h
index 7efad1103c6a..91c3526f0db1 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.h
+++ b/llvm/include/llvm/CodeGen/ValueTypes.h
@@ -40,8 +40,9 @@ namespace MVT {  // MVT = Machine Value Types
     f64             =  8,   // This is a 64 bit floating point value
     f80             =  9,   // This is a 80 bit floating point value
     f128            = 10,   // This is a 128 bit floating point value
+    Flag           =  11,   // This is a condition code or machine flag.
 
-    isVoid          = 11,   // This has no value
+    isVoid          = 12,   // This has no value
 
     LAST_VALUETYPE,         // This always remains at the end of the list.
   };
diff --git a/llvm/lib/Target/Target.td b/llvm/lib/Target/Target.td
index 471c0179a122..df307589f90d 100644
--- a/llvm/lib/Target/Target.td
+++ b/llvm/lib/Target/Target.td
@@ -35,8 +35,9 @@ def i128   : ValueType<128,  5>;   // 128-bit integer value
 def f32    : ValueType<32 ,  7>;   // 32-bit floating point value
 def f64    : ValueType<64 ,  8>;   // 64-bit floating point value
 def f80    : ValueType<80 ,  9>;   // 80-bit floating point value
-def f128   : ValueType<128,  9>;   // 128-bit floating point value
-def isVoid : ValueType<0  , 11>;   // Produces no value
+def f128   : ValueType<128, 10>;   // 128-bit floating point value
+def FlagVT : ValueType<0  , 11>;   // Condition code or machine flag
+def isVoid : ValueType<0  , 12>;   // Produces no value
 
 //===----------------------------------------------------------------------===//
 // Register file description - These classes are used to fill in the target