1 files changed, 15 insertions, 13 deletions
diff --git a/lib/Driver/ToolChains/Cuda.h b/lib/Driver/ToolChains/Cuda.h
index 3d08cec1643e..99d5a4a628ce 100644
--- a/lib/Driver/ToolChains/Cuda.h
+++ b/lib/Driver/ToolChains/Cuda.h
@@ -11,14 +11,14 @@
 #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_CUDA_H
 
 #include "clang/Basic/Cuda.h"
-#include "clang/Basic/VersionTuple.h"
 #include "clang/Driver/Action.h"
 #include "clang/Driver/Multilib.h"
-#include "clang/Driver/ToolChain.h"
 #include "clang/Driver/Tool.h"
+#include "clang/Driver/ToolChain.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/VersionTuple.h"
 #include <set>
 #include <vector>
 
@@ -49,30 +49,30 @@ public:
   void AddCudaIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                           llvm::opt::ArgStringList &CC1Args) const;
 
-  /// \brief Emit an error if Version does not support the given Arch.
+  /// Emit an error if Version does not support the given Arch.
   ///
   /// If either Version or Arch is unknown, does not emit an error.  Emits at
   /// most one error per Arch.
   void CheckCudaVersionSupportsArch(CudaArch Arch) const;
 
-  /// \brief Check whether we detected a valid Cuda install.
+  /// Check whether we detected a valid Cuda install.
   bool isValid() const { return IsValid; }
-  /// \brief Print information about the detected CUDA installation.
+  /// Print information about the detected CUDA installation.
   void print(raw_ostream &OS) const;
 
-  /// \brief Get the detected Cuda install's version.
+  /// Get the detected Cuda install's version.
   CudaVersion version() const { return Version; }
-  /// \brief Get the detected Cuda installation path.
+  /// Get the detected Cuda installation path.
   StringRef getInstallPath() const { return InstallPath; }
-  /// \brief Get the detected path to Cuda's bin directory.
+  /// Get the detected path to Cuda's bin directory.
   StringRef getBinPath() const { return BinPath; }
-  /// \brief Get the detected Cuda Include path.
+  /// Get the detected Cuda Include path.
   StringRef getIncludePath() const { return IncludePath; }
-  /// \brief Get the detected Cuda library path.
+  /// Get the detected Cuda library path.
   StringRef getLibPath() const { return LibPath; }
-  /// \brief Get the detected Cuda device library path.
+  /// Get the detected Cuda device library path.
   StringRef getLibDevicePath() const { return LibDevicePath; }
-  /// \brief Get libdevice file for given architecture
+  /// Get libdevice file for given architecture
   std::string getLibDeviceFile(StringRef Gpu) const {
     return LibDeviceMap.lookup(Gpu);
   }
@@ -115,7 +115,7 @@ class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
 class LLVM_LIBRARY_VISIBILITY OpenMPLinker : public Tool {
  public:
    OpenMPLinker(const ToolChain &TC)
-       : Tool("NVPTX::OpenMPLinker", "fatbinary", TC, RF_Full, llvm::sys::WEM_UTF8,
+       : Tool("NVPTX::OpenMPLinker", "nvlink", TC, RF_Full, llvm::sys::WEM_UTF8,
               "--options-file") {}
 
    bool hasIntegratedCPP() const override { return false; }
@@ -180,6 +180,8 @@ public:
   computeMSVCVersion(const Driver *D,
                      const llvm::opt::ArgList &Args) const override;
 
+  unsigned GetDefaultDwarfVersion() const override { return 2; }
+
   const ToolChain &HostTC;
   CudaInstallationDetector CudaInstallation;