|
9 | 9 | #include "CommonArgs.h"
|
10 | 10 | #include "clang/Driver/Compilation.h"
|
11 | 11 | #include "clang/Driver/Driver.h"
|
12 |
| -#include "clang/Driver/InputInfo.h" |
13 | 12 | #include "clang/Driver/DriverDiagnostic.h"
|
| 13 | +#include "clang/Driver/InputInfo.h" |
14 | 14 | #include "clang/Driver/Options.h"
|
15 | 15 | #include "llvm/Support/CommandLine.h"
|
16 | 16 | #include "llvm/Support/FileSystem.h"
|
@@ -270,8 +270,9 @@ const char *SYCL::Linker::constructLLVMLinkCommand(
|
270 | 270 | // TODO: temporary workaround for a problem with warnings reported by
|
271 | 271 | // llvm-link when driver links LLVM modules with empty modules
|
272 | 272 | CmdArgs.push_back("--suppress-warnings");
|
273 |
| - C.addCommand(std::make_unique<Command>( |
274 |
| - JA, *this, ResponseFileSupport::AtFileUTF8(), Exec, CmdArgs, std::nullopt)); |
| 273 | + C.addCommand(std::make_unique<Command>(JA, *this, |
| 274 | + ResponseFileSupport::AtFileUTF8(), |
| 275 | + Exec, CmdArgs, std::nullopt)); |
275 | 276 | };
|
276 | 277 |
|
277 | 278 | // Add an intermediate output file.
|
@@ -312,8 +313,9 @@ void SYCL::Linker::constructLlcCommand(Compilation &C, const JobAction &JA,
|
312 | 313 | SmallString<128> LlcPath(C.getDriver().Dir);
|
313 | 314 | llvm::sys::path::append(LlcPath, "llc");
|
314 | 315 | const char *Llc = C.getArgs().MakeArgString(LlcPath);
|
315 |
| - C.addCommand(std::make_unique<Command>( |
316 |
| - JA, *this, ResponseFileSupport::AtFileUTF8(), Llc, LlcArgs, std::nullopt)); |
| 316 | + C.addCommand(std::make_unique<Command>(JA, *this, |
| 317 | + ResponseFileSupport::AtFileUTF8(), Llc, |
| 318 | + LlcArgs, std::nullopt)); |
317 | 319 | }
|
318 | 320 |
|
319 | 321 | // For SYCL the inputs of the linker job are SPIR-V binaries and output is
|
@@ -552,10 +554,8 @@ void SYCL::fpga::BackendCompiler::ConstructJob(
|
552 | 554 | const char *FolderName = Args.MakeArgString(FN);
|
553 | 555 | ReportOptArg += FolderName;
|
554 | 556 | } else {
|
555 |
| - // Output directory is based off of the first object name as captured |
556 |
| - // above. |
557 |
| - if (!CreatedReportName.empty()) |
558 |
| - ReportOptArg += CreatedReportName; |
| 557 | + // Default output directory should match default output executable name |
| 558 | + ReportOptArg += "a.prj"; |
559 | 559 | }
|
560 | 560 | if (!ReportOptArg.empty())
|
561 | 561 | CmdArgs.push_back(C.getArgs().MakeArgString(
|
|
0 commit comments