diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index 65e984a..e650993 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -70,7 +70,7 @@
                        const LangOptions &LangOpts, IdentifierTable &Table) {
   int Flags = 0;
   if (BoolSupport != 0) {
-    Flags = LangOpts.Boolean ? BoolSupport : 2;
+    Flags = LangOpts.CPlusPlus? 0 : LangOpts.Boolean ? BoolSupport : 2;
   } else if (LangOpts.CPlusPlus) {
     Flags = LangOpts.CPlusPlus0x ? CXX0x : CXX;
   } else if (LangOpts.C99) {