This reverts commit r242058, r242065, r242067.

The tests were failing on OS X.

Revert "[cuda] Driver changes to compile and stitch together host and device-side CUDA code."
Revert "Fixed regex to properly match '64' in the test case."
Revert "clang/test/Driver/cuda-options.cu REQUIRES clang-driver, at least."

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242077 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 0 insertions, 37 deletions

diff --git a/include/clang/Driver/Action.h b/include/clang/Driver/Action.h
index fddd15885e..847c994a58 100644
--- a/include/clang/Driver/Action.h
+++ b/include/clang/Driver/Action.h
@@ -41,8 +41,6 @@ public:
   enum ActionClass {
     InputClass = 0,
     BindArchClass,
-    CudaDeviceClass,
-    CudaHostClass,
     PreprocessJobClass,
     PrecompileJobClass,
     AnalyzeJobClass,
@@ -135,41 +133,6 @@ public:
   }
 };
 
-class CudaDeviceAction : public Action {
-  virtual void anchor();
-  /// GPU architecture to bind -- e.g 'sm_35'.
-  const char *GpuArchName;
-  /// True when action results are not consumed by the host action (e.g when
-  /// -fsyntax-only or --cuda-device-only options are used).
-  bool AtTopLevel;
-
-public:
-  CudaDeviceAction(std::unique_ptr<Action> Input, const char *ArchName,
-                   bool AtTopLevel);
-
-  const char *getGpuArchName() const { return GpuArchName; }
-  bool isAtTopLevel() const { return AtTopLevel; }
-
-  static bool classof(const Action *A) {
-    return A->getKind() == CudaDeviceClass;
-  }
-};
-
-class CudaHostAction : public Action {
-  virtual void anchor();
-  ActionList DeviceActions;
-
-public:
-  CudaHostAction(std::unique_ptr<Action> Input,
-                 const ActionList &DeviceActions);
-  ~CudaHostAction() override;
-
-  ActionList &getDeviceActions() { return DeviceActions; }
-  const ActionList &getDeviceActions() const { return DeviceActions; }
-
-  static bool classof(const Action *A) { return A->getKind() == CudaHostClass; }
-};
-
 class JobAction : public Action {
   virtual void anchor();
 protected: