summaryrefslogtreecommitdiffstats
path: root/clang/lib/Basic/IdentifierTable.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-05-21 20:22:37 +0000
committerChris Lattner <sabre@nondot.org>2010-05-21 20:22:37 +0000
commitc425fe4c8014c1f0c921d94ba03d8e137b42a3fa (patch)
tree4201326a4996f6f7b9ee3f127e51933a2bf5863b /clang/lib/Basic/IdentifierTable.cpp
parent7d7f6043213a1234addce9acdf70099ce1ef4276 (diff)
downloadbcm5719-llvm-c425fe4c8014c1f0c921d94ba03d8e137b42a3fa.tar.gz
bcm5719-llvm-c425fe4c8014c1f0c921d94ba03d8e137b42a3fa.zip
don't make _Bool be a keyword in -fms-extensions mode, patch by
Steven Watanabe! llvm-svn: 104373
Diffstat (limited to 'clang/lib/Basic/IdentifierTable.cpp')
-rw-r--r--clang/lib/Basic/IdentifierTable.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index ed0de8c4af0..8993e6713fb 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -70,7 +70,8 @@ namespace {
KEYGNU = 16,
KEYMS = 32,
BOOLSUPPORT = 64,
- KEYALTIVEC = 128
+ KEYALTIVEC = 128,
+ KEYNOMS = 256
};
}
@@ -94,6 +95,7 @@ static void AddKeyword(llvm::StringRef Keyword,
else if (LangOpts.Microsoft && (Flags & KEYMS)) AddResult = 1;
else if (LangOpts.Bool && (Flags & BOOLSUPPORT)) AddResult = 2;
else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2;
+ else if (!LangOpts.Microsoft && (Flags & KEYNOMS)) AddResult = 2;
// Don't add this keyword if disabled in this language.
if (AddResult == 0) return;
OpenPOWER on IntegriCloud