diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h
index b7bd62a3807..7455f623ecd 100644
--- a/include/Support/CommandLine.h
+++ b/include/Support/CommandLine.h
@@ -292,6 +292,7 @@ LocationClass<Ty> location(Ty &L) { return LocationClass<Ty>(L); }
 //
 #define clEnumVal(ENUMVAL, DESC) #ENUMVAL, (int)ENUMVAL, DESC
 #define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, (int)ENUMVAL, DESC
+#define clEnumValEnd ((void*)0)
 
 // values - For custom data types, allow specifying a group of values together
 // as the values that go into the mapping that the option handler uses.  Note
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index b7bd62a3807..7455f623ecd 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -292,6 +292,7 @@ LocationClass<Ty> location(Ty &L) { return LocationClass<Ty>(L); }
 //
 #define clEnumVal(ENUMVAL, DESC) #ENUMVAL, (int)ENUMVAL, DESC
 #define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, (int)ENUMVAL, DESC
+#define clEnumValEnd ((void*)0)
 
 // values - For custom data types, allow specifying a group of values together
 // as the values that go into the mapping that the option handler uses.  Note