diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-08-26 05:31:56 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-08-26 05:31:56 +0000 |
| commit | e09f743d388798240275b24398d25da11fab5297 (patch) | |
| tree | e73104afc4715bca630763b37042b0c9221d64e1 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 20479074f4a68b855310ad79022499d7c7e08ade (diff) | |
| parent | 8d91e71e9a015c864b29725ec9430c5db4325cf4 (diff) | |
| download | rust-e09f743d388798240275b24398d25da11fab5297.tar.gz rust-e09f743d388798240275b24398d25da11fab5297.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp index 35d6b9ed7a4..54fdc84c77d 100644 --- a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp @@ -203,7 +203,12 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers, } } +#if LLVM_VERSION_LT(18, 0) auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false); +#else + auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab : SymtabWritingMode::NoSymtab; + auto Result = writeArchive(Dst, Members, SymtabMode, Kind, true, false); +#endif if (!Result) return LLVMRustResult::Success; LLVMRustSetLastError(toString(std::move(Result)).c_str()); |