diff options
| -rw-r--r-- | include/clang/Driver/Types.def | 1 | ||||
| -rw-r--r-- | include/clang/Frontend/FrontendAction.h | 1 | ||||
| -rw-r--r-- | include/clang/Frontend/LangStandards.def | 5 | ||||
| -rw-r--r-- | lib/Driver/Types.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 8 | ||||
| -rw-r--r-- | lib/Frontend/FrontendActions.cpp | 1 | ||||
| -rw-r--r-- | lib/Frontend/FrontendOptions.cpp | 1 |
7 files changed, 19 insertions, 0 deletions
diff --git a/include/clang/Driver/Types.def b/include/clang/Driver/Types.def index 06a8690ce8..f09a1dcaf2 100644 --- a/include/clang/Driver/Types.def +++ b/include/clang/Driver/Types.def @@ -42,6 +42,7 @@ TYPE("cpp-output", PP_C, INVALID, "i", "u") TYPE("c", C, PP_C, 0, "u") TYPE("cl", CL, PP_C, 0, "u") +TYPE("cuda", CUDA, PP_CXX, 0, "u") TYPE("objective-c-cpp-output", PP_ObjC, INVALID, "mi", "u") TYPE("objective-c", ObjC, PP_ObjC, 0, "u") TYPE("c++-cpp-output", PP_CXX, INVALID, "ii", "u") diff --git a/include/clang/Frontend/FrontendAction.h b/include/clang/Frontend/FrontendAction.h index f659b2f42e..e3551d7749 100644 --- a/include/clang/Frontend/FrontendAction.h +++ b/include/clang/Frontend/FrontendAction.h @@ -37,6 +37,7 @@ enum InputKind { IK_PreprocessedObjC, IK_PreprocessedObjCXX, IK_OpenCL, + IK_CUDA, IK_AST, IK_LLVM_IR }; diff --git a/include/clang/Frontend/LangStandards.def b/include/clang/Frontend/LangStandards.def index 52aa463608..d4046b3e56 100644 --- a/include/clang/Frontend/LangStandards.def +++ b/include/clang/Frontend/LangStandards.def @@ -80,4 +80,9 @@ LANGSTANDARD(opencl, "cl", "OpenCL 1.0", BCPLComment | C99 | Digraphs | HexFloat) +// CUDA +LANGSTANDARD(cuda, "cuda", + "NVIDIA CUDA(tm)", + BCPLComment | CPlusPlus | Digraphs) + #undef LANGSTANDARD diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index 3c07cf2898..c677149a76 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -78,6 +78,7 @@ bool types::isAcceptedByClang(ID Id) { case TY_Asm: case TY_C: case TY_PP_C: case TY_CL: + case TY_CUDA: case TY_ObjC: case TY_PP_ObjC: case TY_CXX: case TY_PP_CXX: case TY_ObjCXX: case TY_PP_ObjCXX: @@ -151,6 +152,7 @@ types::ID types::lookupTypeForExtension(const char *Ext) { .Case("CC", TY_CXX) .Case("cl", TY_CL) .Case("cp", TY_CXX) + .Case("cu", TY_CUDA) .Case("hh", TY_CXXHeader) .Case("ll", TY_LLVM_IR) .Case("hpp", TY_CXXHeader) diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index c00ffc88a6..fcefad7b3e 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -302,6 +302,7 @@ static const char *getInputKindName(InputKind Kind) { case IK_ObjC: return "objective-c"; case IK_ObjCXX: return "objective-c++"; case IK_OpenCL: return "cl"; + case IK_CUDA: return "cuda"; case IK_PreprocessedC: return "cpp-output"; case IK_PreprocessedCXX: return "c++-cpp-output"; case IK_PreprocessedObjC: return "objective-c-cpp-output"; @@ -1113,6 +1114,7 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, .Case("cl", IK_OpenCL) .Case("c", IK_C) .Case("cl", IK_OpenCL) + .Case("cuda", IK_CUDA) .Case("c++", IK_CXX) .Case("objective-c", IK_ObjC) .Case("objective-c++", IK_ObjCXX) @@ -1254,6 +1256,9 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, case IK_OpenCL: LangStd = LangStandard::lang_opencl; break; + case IK_CUDA: + LangStd = LangStandard::lang_cuda; + break; case IK_Asm: case IK_C: case IK_PreprocessedC: @@ -1289,6 +1294,9 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Opts.LaxVectorConversions = 1; } + if (LangStd == LangStandard::lang_cuda) + Opts.CUDA = 1; + // OpenCL and C++ both have bool, true, false keywords. Opts.Bool = Opts.OpenCL || Opts.CPlusPlus; diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 0ffc06a477..eb7152cb47 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -204,6 +204,7 @@ void PrintPreambleAction::ExecuteAction() { case IK_ObjC: case IK_ObjCXX: case IK_OpenCL: + case IK_CUDA: break; case IK_None: diff --git a/lib/Frontend/FrontendOptions.cpp b/lib/Frontend/FrontendOptions.cpp index 9dfee244ea..0a2005192a 100644 --- a/lib/Frontend/FrontendOptions.cpp +++ b/lib/Frontend/FrontendOptions.cpp @@ -26,6 +26,7 @@ InputKind FrontendOptions::getInputKindForExtension(llvm::StringRef Extension) { .Cases("C", "cc", "cp", IK_CXX) .Cases("cpp", "CPP", "c++", "cxx", "hpp", IK_CXX) .Case("cl", IK_OpenCL) + .Case("cu", IK_CUDA) .Cases("ll", "bc", IK_LLVM_IR) .Default(IK_C); } |