[llvm-branch-commits] [cfe-branch] r128225 - in /cfe/branches/release_29: include/clang/Driver/Types.def include/clang/Frontend/FrontendAction.h include/clang/Frontend/LangStandards.def lib/Driver/Types.cpp lib/Frontend/CompilerInvocation.cpp lib/Frontend/FrontendActions.cpp lib/Frontend/FrontendOptions.cpp test/CMakeLists.txt

Bill Wendling isanbard at gmail.com
Thu Mar 24 11:38:20 PDT 2011


Author: void
Date: Thu Mar 24 13:38:20 2011
New Revision: 128225

URL: http://llvm.org/viewvc/llvm-project?rev=128225&view=rev
Log:
Disable CUDA support.
Patch by Peter Collingbourne!

Modified:
    cfe/branches/release_29/include/clang/Driver/Types.def
    cfe/branches/release_29/include/clang/Frontend/FrontendAction.h
    cfe/branches/release_29/include/clang/Frontend/LangStandards.def
    cfe/branches/release_29/lib/Driver/Types.cpp
    cfe/branches/release_29/lib/Frontend/CompilerInvocation.cpp
    cfe/branches/release_29/lib/Frontend/FrontendActions.cpp
    cfe/branches/release_29/lib/Frontend/FrontendOptions.cpp
    cfe/branches/release_29/test/CMakeLists.txt

Modified: cfe/branches/release_29/include/clang/Driver/Types.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/include/clang/Driver/Types.def?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/include/clang/Driver/Types.def (original)
+++ cfe/branches/release_29/include/clang/Driver/Types.def Thu Mar 24 13:38:20 2011
@@ -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")

Modified: cfe/branches/release_29/include/clang/Frontend/FrontendAction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/include/clang/Frontend/FrontendAction.h?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/include/clang/Frontend/FrontendAction.h (original)
+++ cfe/branches/release_29/include/clang/Frontend/FrontendAction.h Thu Mar 24 13:38:20 2011
@@ -37,7 +37,6 @@
   IK_PreprocessedObjC,
   IK_PreprocessedObjCXX,
   IK_OpenCL,
-  IK_CUDA,
   IK_AST,
   IK_LLVM_IR
 };

Modified: cfe/branches/release_29/include/clang/Frontend/LangStandards.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/include/clang/Frontend/LangStandards.def?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/include/clang/Frontend/LangStandards.def (original)
+++ cfe/branches/release_29/include/clang/Frontend/LangStandards.def Thu Mar 24 13:38:20 2011
@@ -80,9 +80,4 @@
              "OpenCL 1.0",
              BCPLComment | C99 | Digraphs | HexFloat)
 
-// CUDA
-LANGSTANDARD(cuda, "cuda",
-             "NVIDIA CUDA(tm)",
-             BCPLComment | CPlusPlus | Digraphs)
-
 #undef LANGSTANDARD

Modified: cfe/branches/release_29/lib/Driver/Types.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Driver/Types.cpp?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Driver/Types.cpp (original)
+++ cfe/branches/release_29/lib/Driver/Types.cpp Thu Mar 24 13:38:20 2011
@@ -78,7 +78,6 @@
   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 @@
            .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)

Modified: cfe/branches/release_29/lib/Frontend/CompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Frontend/CompilerInvocation.cpp?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Frontend/CompilerInvocation.cpp (original)
+++ cfe/branches/release_29/lib/Frontend/CompilerInvocation.cpp Thu Mar 24 13:38:20 2011
@@ -303,7 +303,6 @@
   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 @@
       .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 @@
     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 @@
     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;
 

Modified: cfe/branches/release_29/lib/Frontend/FrontendActions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Frontend/FrontendActions.cpp?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Frontend/FrontendActions.cpp (original)
+++ cfe/branches/release_29/lib/Frontend/FrontendActions.cpp Thu Mar 24 13:38:20 2011
@@ -198,7 +198,6 @@
   case IK_ObjC:
   case IK_ObjCXX:
   case IK_OpenCL:
-  case IK_CUDA:
     break;
       
   case IK_None:

Modified: cfe/branches/release_29/lib/Frontend/FrontendOptions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Frontend/FrontendOptions.cpp?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Frontend/FrontendOptions.cpp (original)
+++ cfe/branches/release_29/lib/Frontend/FrontendOptions.cpp Thu Mar 24 13:38:20 2011
@@ -26,7 +26,6 @@
     .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);
 }

Modified: cfe/branches/release_29/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/CMakeLists.txt?rev=128225&r1=128224&r2=128225&view=diff
==============================================================================
--- cfe/branches/release_29/test/CMakeLists.txt (original)
+++ cfe/branches/release_29/test/CMakeLists.txt Thu Mar 24 13:38:20 2011
@@ -19,7 +19,6 @@
   "Preprocessor"
   "Rewriter"
   "Sema"
-  "SemaCUDA"
   "SemaCXX"
   "SemaObjC"
   "SemaObjCXX"





More information about the llvm-branch-commits mailing list