summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r--clang/lib/Driver/Action.cpp3
-rw-r--r--clang/lib/Driver/ToolChains.cpp5
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/lib/Driver/Action.cpp b/clang/lib/Driver/Action.cpp
index b45f290efc1..f9e1024f920 100644
--- a/clang/lib/Driver/Action.cpp
+++ b/clang/lib/Driver/Action.cpp
@@ -66,6 +66,9 @@ static const char* GpuArchToComputeName(const char *ArchName) {
.Case("sm_50", "compute_50")
.Case("sm_52", "compute_52")
.Case("sm_53", "compute_53")
+ .Case("sm_60", "compute_60")
+ .Case("sm_61", "compute_61")
+ .Case("sm_62", "compute_62")
.Default(nullptr);
}
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 7884c402eb2..58786e092fd 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1715,6 +1715,8 @@ void Generic_GCC::CudaInstallationDetector::init(
Args.getLastArgValue(options::OPT_cuda_path_EQ));
else {
CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda");
+ // FIXME: Uncomment this once we can compile the cuda 8 headers.
+ // CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda-8.0");
CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda-7.5");
CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda-7.0");
}
@@ -1761,6 +1763,9 @@ void Generic_GCC::CudaInstallationDetector::init(
CudaLibDeviceMap["sm_50"] = FilePath;
CudaLibDeviceMap["sm_52"] = FilePath;
CudaLibDeviceMap["sm_53"] = FilePath;
+ CudaLibDeviceMap["sm_60"] = FilePath;
+ CudaLibDeviceMap["sm_61"] = FilePath;
+ CudaLibDeviceMap["sm_62"] = FilePath;
}
}
OpenPOWER on IntegriCloud