summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChain.cpp
diff options
context:
space:
mode:
authorGheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com>2017-08-09 01:02:19 +0000
committerGheorghe-Teodor Bercea <gheorghe-teod.bercea@ibm.com>2017-08-09 01:02:19 +0000
commit52898435970ef0cacf7819500ca9a5f2a79fe23d (patch)
tree1abdcc41184c999988fe245380390b122eac59b6 /clang/lib/Driver/ToolChain.cpp
parent703035474467d0c84ed80c969ef3c58b7bf8c244 (diff)
downloadbcm5719-llvm-52898435970ef0cacf7819500ca9a5f2a79fe23d.tar.gz
bcm5719-llvm-52898435970ef0cacf7819500ca9a5f2a79fe23d.zip
[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
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r--clang/lib/Driver/ToolChain.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 94d5e4fc0f2..10fad752cfe 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -802,6 +802,7 @@ ToolChain::TranslateOpenMPTargetArgs(const llvm::opt::DerivedArgList &Args,
if (DeviceOffloadKind == Action::OFK_OpenMP) {
DerivedArgList *DAL = new DerivedArgList(Args.getBaseArgs());
const OptTable &Opts = getDriver().getOpts();
+ bool NewArgAdded = false;
// Handle -Xopenmp-target flags
for (Arg *A : Args) {
@@ -850,9 +851,10 @@ ToolChain::TranslateOpenMPTargetArgs(const llvm::opt::DerivedArgList &Args,
XOpenMPTargetArg->setBaseArg(A);
A = XOpenMPTargetArg.release();
DAL->append(A);
+ NewArgAdded = true;
}
- return DAL;
+ return NewArgAdded ? DAL : nullptr;
}
return nullptr;
OpenPOWER on IntegriCloud