commit 52898435970ef0cacf7819500ca9a5f2a79fe23d
author Gheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com> Wed Aug 09 01:02:19 2017 +0000
committer Gheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com> Wed Aug 09 01:02:19 2017 +0000
tree 1abdcc41184c999988fe245380390b122eac59b6
parent 703035474467d0c84ed80c969ef3c58b7bf8c244

[OpenMP] Fix bug regarding cubin integration into host binary
when a BindArchAction is used.

This is not a functional change.

Original Diff: D29654

llvm-svn: 310433

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 9c39a55..e1c6325 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -579,7 +579,7 @@
                   C.getSingleOffloadToolChain<Action::OFK_Host>();
               assert(HostTC && "Host toolchain should be always defined.");
               auto &CudaTC =
-                  ToolChains[TT.str() + "/" + HostTC->getTriple().str()];
+                  ToolChains[TT.str() + "/" + HostTC->getTriple().normalize()];
               if (!CudaTC)
                 CudaTC = llvm::make_unique<toolchains::CudaToolChain>(
                     *this, TT, *HostTC, C.getInputArgs(), Action::OFK_OpenMP);
@@ -3407,7 +3407,7 @@
       // Get the unique string identifier for this dependence and cache the
       // result.
       CachedResults[{A, GetTriplePlusArchString(
-                            UI.DependentToolChain, UI.DependentBoundArch,
+                            UI.DependentToolChain, BoundArch,
                             UI.DependentOffloadKind)}] = CurI;
     }