diff --git a/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp b/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp --- a/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp +++ b/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 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); }