File amd-comgr-fix-compiler.patch of Package rocm-llvm
diff --git a/amd/comgr/src/comgr-compiler.cpp b/amd/comgr/src/comgr-compiler.cpp
index e568a4d07c4e..00701048d39e 100644
--- a/amd/comgr/src/comgr-compiler.cpp
+++ b/amd/comgr/src/comgr-compiler.cpp
@@ -610,7 +610,7 @@ amd_comgr_status_t linkWithLLD(llvm::ArrayRef<const char *> Args,
llvm::raw_ostream &LogE) {
ArgStringList LLDArgs(llvm::iterator_range<ArrayRef<const char *>::iterator>(
Args.begin(), Args.end()));
- LLDArgs.insert(LLDArgs.begin(), "ld.lld");
+ LLDArgs.insert(LLDArgs.begin(), "ld.lld-rocm");
LLDArgs.push_back("--threads=1");
ArrayRef<const char *> ArgRefs = llvm::ArrayRef(LLDArgs);
@@ -654,7 +654,7 @@ amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
if (Argv[1] == StringRef("-cc1")) {
if (env::shouldEmitVerboseLogs()) {
- logArgv(LogS, "clang", Argv);
+ logArgv(LogS, "clang-rocm", Argv);
}
std::unique_ptr<CompilerInstance> Clang(new CompilerInstance());
@@ -680,7 +680,7 @@ amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
}
} else if (Argv[1] == StringRef("-cc1as")) {
if (env::shouldEmitVerboseLogs()) {
- logArgv(LogS, "clang", Argv);
+ logArgv(LogS, "clang-rocm", Argv);
}
Argv.erase(Argv.begin() + 1);
if (!Argv.back()) {
@@ -698,7 +698,7 @@ amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
}
} else if (Job.getCreator().getName() == LinkerJobName) {
if (env::shouldEmitVerboseLogs()) {
- logArgv(LogS, "lld", Argv);
+ logArgv(LogS, "lld-rocm", Argv);
}
if (auto Status = linkWithLLD(Arguments, LogS, LogS)) {
return Status;
@@ -746,7 +746,7 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
ProcessWarningOptions(Diags, *DiagOpts, *OverlayFS, /*ReportDiags=*/false);
- Driver TheDriver((Twine(env::getLLVMPath()) + "/bin/clang").str(),
+ Driver TheDriver((Twine(env::getLLVMPath()) + "/bin/clang-rocm").str(),
llvm::sys::getDefaultTargetTriple(), Diags,
"AMDGPU Code Object Manager", OverlayFS);
TheDriver.setCheckInputsExist(false);