Commit dce4b0ea authored by Bill Wendling's avatar Bill Wendling
Browse files

Disable CUDA support. 

Patch by Peter Collingbourne!

llvm-svn: 128225
parent 334706d7

clang/include/clang/Driver/Types.def

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
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")

clang/include/clang/Frontend/FrontendAction.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ enum InputKind { 
  IK_PreprocessedObjC,

  IK_PreprocessedObjCXX,

  IK_OpenCL,

  IK_CUDA,

  IK_AST,

  IK_LLVM_IR

};

clang/include/clang/Frontend/LangStandards.def

+0 −5
Original line number Diff line number Diff line
@@ -80,9 +80,4 @@ LANGSTANDARD(opencl, "cl", 
             "OpenCL 1.0",

             BCPLComment | C99 | Digraphs | HexFloat)



// CUDA

LANGSTANDARD(cuda, "cuda",

             "NVIDIA CUDA(tm)",

             BCPLComment | CPlusPlus | Digraphs)



#undef LANGSTANDARD

clang/lib/Driver/Types.cpp

+0 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 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:
@@ -152,7 +151,6 @@ 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)

clang/lib/Frontend/CompilerInvocation.cpp

+0 −8
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ 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";
@@ -1150,7 +1149,6 @@ 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)
@@ -1279,9 +1277,6 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, 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:
@@ -1318,9 +1313,6 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK, 
    Opts.DefaultFPContract = 1;

  }



  if (LangStd == LangStandard::lang_cuda)

    Opts.CUDA = 1;



  // OpenCL and C++ both have bool, true, false keywords.

  Opts.Bool = Opts.OpenCL || Opts.CPlusPlus;