diff options
| author | Justin Lebar <jlebar@google.com> | 2016-01-11 23:15:21 +0000 |
|---|---|---|
| committer | Justin Lebar <jlebar@google.com> | 2016-01-11 23:15:21 +0000 |
| commit | d98cea8c8bd43551a290f7f752086d81d61d42be (patch) | |
| tree | b8d366fce67e14543cd382de724db53eea254db5 /clang/lib/Driver/Tools.cpp | |
| parent | d9d2a896fa7a2fb8ca1be07e7a391745928c5456 (diff) | |
| download | llvm-d98cea8c8bd43551a290f7f752086d81d61d42be.zip llvm-d98cea8c8bd43551a290f7f752086d81d61d42be.tar.gz llvm-d98cea8c8bd43551a290f7f752086d81d61d42be.tar.bz2 | |
Add an Action* member to InputInfo.
Summary:
The CUDA toolchain needs to know which Actions created which InputInfos,
because it needs to attach GPU archs to the various InputInfos.
Reviewers: echristo
Subscribers: jfb, dschuff, jhen, tra, cfe-commits
Differential Revision: http://reviews.llvm.org/D16078
llvm-svn: 257411
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 2ed847a..9a1a949 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2980,7 +2980,7 @@ static void SplitDebugInfo(const ToolChain &TC, Compilation &C, const Tool &T, ExtractArgs.push_back(OutFile); const char *Exec = Args.MakeArgString(TC.GetProgramPath("objcopy")); - InputInfo II(Output.getFilename(), types::TY_Object, Output.getFilename()); + InputInfo II(types::TY_Object, Output.getFilename(), Output.getFilename()); // First extract the dwo sections. C.addCommand(llvm::make_unique<Command>(JA, T, Exec, ExtractArgs, II)); @@ -8987,7 +8987,7 @@ void nacltools::AssemblerARM::ConstructJob(Compilation &C, const JobAction &JA, const char *LinkingOutput) const { const toolchains::NaClToolChain &ToolChain = static_cast<const toolchains::NaClToolChain &>(getToolChain()); - InputInfo NaClMacros(ToolChain.GetNaClArmMacrosPath(), types::TY_PP_Asm, + InputInfo NaClMacros(types::TY_PP_Asm, ToolChain.GetNaClArmMacrosPath(), "nacl-arm-macros.s"); InputInfoList NewInputs; NewInputs.push_back(NaClMacros); |