JonChesterfield created this revision.
JonChesterfield added reviewers: vzakhari, ABataev, grokos, sdmitriev,
jdoerfert, ronlieb.
Herald added subscribers: guansong, yaxunl.
JonChesterfield requested review of this revision.
Herald added subscribers: cfe-commits, sstefan1.
Herald added a project: clang.
D99551 <https://reviews.llvm.org/D99551> broke nvptx offloading. This patch
fixes that by disabling the functional change of
D99551 <https://reviews.llvm.org/D99551>, allowing time to fix it without
excessive
out of tree churn
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D108303
Files:
clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
Index: clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
===================================================================
--- clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
+++ clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
@@ -587,6 +587,9 @@
} // anonymous namespace
int main(int argc, const char **argv) {
+ // Embedded elf notes does not work on nvptx, disabling it globally while
+ // a fix is worked on offline
+ const bool EmbedElfNotes = false;
sys::PrintStackTraceOnErrorSignal(argv[0]);
cl::HideUnrelatedOptions(ClangOffloadWrapperCategory);
@@ -630,7 +633,7 @@
return 1;
}
std::unique_ptr<MemoryBuffer> Buffer(std::move(*BufOrErr));
- if (File != "-") {
+ if (EmbedElfNotes && File != "-") {
// Adding ELF notes for STDIN is not supported yet.
Buffer = Wrapper.addELFNotes(std::move(Buffer), File);
}
Index: clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
===================================================================
--- clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
+++ clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
@@ -587,6 +587,9 @@
} // anonymous namespace
int main(int argc, const char **argv) {
+ // Embedded elf notes does not work on nvptx, disabling it globally while
+ // a fix is worked on offline
+ const bool EmbedElfNotes = false;
sys::PrintStackTraceOnErrorSignal(argv[0]);
cl::HideUnrelatedOptions(ClangOffloadWrapperCategory);
@@ -630,7 +633,7 @@
return 1;
}
std::unique_ptr<MemoryBuffer> Buffer(std::move(*BufOrErr));
- if (File != "-") {
+ if (EmbedElfNotes && File != "-") {
// Adding ELF notes for STDIN is not supported yet.
Buffer = Wrapper.addELFNotes(std::move(Buffer), File);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
