Skip to content

Commit ec11f49

Browse files
committed
[Driver] Adjust to response file refactor
Signed-off-by: Michael D Toguchi <[email protected]>
1 parent b76e355 commit ec11f49

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7900,5 +7900,5 @@ void PartialLink::ConstructJob(Compilation &C, const JobAction &JA,
79007900
LinkArgs.push_back(TCArgs.MakeArgString(HTC->GetFilePath("crtn.o")));
79017901
const char *Exec = TCArgs.MakeArgString(getToolChain().GetLinkerPath());
79027902
C.addCommand(std::make_unique<Command>(
7903-
JA, *this, ResponseFileSupport::None(), Exec, LinkArgs, Inputs));
7903+
JA, *this, ResponseFileSupport::AtFileCurCP(), Exec, LinkArgs, Inputs));
79047904
}

clang/lib/Driver/ToolChains/Clang.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ class LLVM_LIBRARY_VISIBILITY FileTableTform final : public Tool {
226226
/// Partially link objects and archives.
227227
class LLVM_LIBRARY_VISIBILITY PartialLink final : public Tool {
228228
public:
229-
PartialLink(const ToolChain &TC)
230-
: Tool("partial link", "partial-link", TC, RF_Full) {}
229+
PartialLink(const ToolChain &TC) : Tool("partial link", "partial-link", TC) {}
231230

232231
bool hasIntegratedCPP() const override { return false; }
233232
bool hasGoodDiagnostics() const override { return true; }

clang/lib/Driver/ToolChains/SYCL.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const char *SYCL::Linker::constructLLVMSpirvCommand(Compilation &C,
5151
llvm::sys::path::append(LLVMSpirvPath, "llvm-spirv");
5252
const char *LLVMSpirv = C.getArgs().MakeArgString(LLVMSpirvPath);
5353
C.addCommand(std::make_unique<Command>(
54-
JA, *this, ResponseFileSupport::None(), LLVMSpirv, CmdArgs, None));
54+
JA, *this, ResponseFileSupport::AtFileUTF8(), LLVMSpirv, CmdArgs, None));
5555
return OutputFileName;
5656
}
5757

@@ -128,7 +128,7 @@ const char *SYCL::Linker::constructLLVMLinkCommand(Compilation &C,
128128
llvm::sys::path::append(ExecPath, "llvm-link");
129129
const char *Exec = C.getArgs().MakeArgString(ExecPath);
130130
C.addCommand(std::make_unique<Command>(
131-
JA, *this, ResponseFileSupport::None(), Exec, CmdArgs, None));
131+
JA, *this, ResponseFileSupport::AtFileUTF8(), Exec, CmdArgs, None));
132132
return OutputFileName;
133133
}
134134

@@ -142,7 +142,7 @@ void SYCL::Linker::constructLlcCommand(Compilation &C, const JobAction &JA,
142142
llvm::sys::path::append(LlcPath, "llc");
143143
const char *Llc = C.getArgs().MakeArgString(LlcPath);
144144
C.addCommand(std::make_unique<Command>(
145-
JA, *this, ResponseFileSupport::None(), Llc, LlcArgs, None));
145+
JA, *this, ResponseFileSupport::AtFileUTF8(), Llc, LlcArgs, None));
146146
}
147147

148148
// For SYCL the inputs of the linker job are SPIR-V binaries and output is

clang/lib/Driver/ToolChains/SYCL.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ void constructLLVMForeachCommand(Compilation &C, const JobAction &JA,
3131
// offloading information. Finally compiles to object using llc
3232
class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
3333
public:
34-
Linker(const ToolChain &TC)
35-
: Tool("SYCL::Linker", "sycl-link", TC, RF_Full) {}
34+
Linker(const ToolChain &TC) : Tool("SYCL::Linker", "sycl-link", TC) {}
3635

3736
bool hasIntegratedCPP() const override { return false; }
3837

0 commit comments

Comments
 (0)