summaryrefslogtreecommitdiffstats
path: root/clang/lib/Basic/IdentifierTable.cpp
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2011-04-15 00:35:23 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2011-04-15 00:35:23 +0000
commita686b5f8bf7b5a2ab636c0c2de5ad4c174aa33e0 (patch)
tree6d65deddafa86721e7278fc1ede96d2be45a9722 /clang/lib/Basic/IdentifierTable.cpp
parent681fef59864051160050ec20113c378b3ecee4cd (diff)
downloadbcm5719-llvm-a686b5f8bf7b5a2ab636c0c2de5ad4c174aa33e0.tar.gz
bcm5719-llvm-a686b5f8bf7b5a2ab636c0c2de5ad4c174aa33e0.zip
C1X: add a language standard
llvm-svn: 129553
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 3d08bf807eb..bbea23ab8da 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -91,7 +91,8 @@ namespace {
KEYNOCXX = 0x80,
KEYBORLAND = 0x100,
KEYOPENCL = 0x200,
- KEYALL = 0x3ff
+ KEYC1X = 0x400,
+ KEYALL = 0x7ff
};
}
@@ -118,6 +119,7 @@ static void AddKeyword(llvm::StringRef Keyword,
else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2;
else if (LangOpts.OpenCL && (Flags & KEYOPENCL)) AddResult = 2;
else if (!LangOpts.CPlusPlus && (Flags & KEYNOCXX)) AddResult = 2;
+ else if (LangOpts.C1X && (Flags & KEYC1X)) AddResult = 2;
// Don't add this keyword if disabled in this language.
if (AddResult == 0) return;
OpenPOWER on IntegriCloud