diff options
| author | Gheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com> | 2017-09-25 21:22:49 +0000 |
|---|---|---|
| committer | Gheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com> | 2017-09-25 21:22:49 +0000 |
| commit | d45720b55a69b71205f090973fc30ed6000fdbed (patch) | |
| tree | 74fe1d26b9bf36a0999b5e8abc2060fd4e8890a6 | |
| parent | 30dc9797e9fd3328b4d816c5b740bb567d6fa230 (diff) | |
| download | bcm5719-llvm-d45720b55a69b71205f090973fc30ed6000fdbed.tar.gz bcm5719-llvm-d45720b55a69b71205f090973fc30ed6000fdbed.zip | |
Revert commit with wrong message.
llvm-svn: 314154
| -rw-r--r-- | clang/lib/Driver/ToolChains/Cuda.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/openmp-offload-gpu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index b70b6b64742..a0b348ffc4a 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -438,7 +438,7 @@ void NVPTX::OpenMPLinker::ConstructJob(Compilation &C, const JobAction &JA, if (!II.isFilename()) continue; - SmallString<256> Name(II.getFilename()); + SmallString<256> Name = llvm::sys::path::filename(II.getFilename()); llvm::sys::path::replace_extension(Name, "cubin"); const char *CubinF = diff --git a/clang/test/Driver/openmp-offload-gpu.c b/clang/test/Driver/openmp-offload-gpu.c index a1bc42eb0fd..3aeeaed53a7 100644 --- a/clang/test/Driver/openmp-offload-gpu.c +++ b/clang/test/Driver/openmp-offload-gpu.c @@ -89,7 +89,7 @@ // RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda %t1.o %t2.o 2>&1 \ // RUN: | FileCheck -check-prefix=CHK-TWOCUBIN %s -// CHK-TWOCUBIN: nvlink{{.*}}openmp-offload-{{.*}}.cubin" "{{.*}}openmp-offload-{{.*}}.cubin" +// CHK-TWOCUBIN: nvlink"{{.*}}"openmp-offload-{{.*}}.cubin" "openmp-offload-{{.*}}.cubin" /// ########################################################################### @@ -99,7 +99,7 @@ // RUN: %clang -### -no-canonical-prefixes -target x86_64-apple-darwin17.0.0 -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda %t1.o %t2.o 2>&1 \ // RUN: | FileCheck -check-prefix=CHK-TWOCUBIN-DARWIN %s -// CHK-TWOCUBIN-DARWIN: nvlink{{.*}}openmp-offload-{{.*}}.cubin" "{{.*}}openmp-offload-{{.*}}.cubin" +// CHK-TWOCUBIN-DARWIN: nvlink"{{.*}}"openmp-offload-{{.*}}.cubin" "openmp-offload-{{.*}}.cubin" /// ########################################################################### |
