diff options
| author | bors <bors@rust-lang.org> | 2024-02-13 07:19:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-13 07:19:39 +0000 |
| commit | fd9bb7fddedddc2ab48665214efae780dc64af2d (patch) | |
| tree | aefb5c40df91e97191af76d6f1aa372e60e004c4 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 09d73fab0823ecddd5e67e042cd0de3863c3d501 (diff) | |
| parent | 70ea26d3499dd4463ec01b5156509ca75e010c78 (diff) | |
| download | rust-fd9bb7fddedddc2ab48665214efae780dc64af2d.tar.gz rust-fd9bb7fddedddc2ab48665214efae780dc64af2d.zip | |
Auto merge of #121003 - matthiaskrgr:rollup-u5wyztn, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #120696 (Properly handle `async` block and `async fn` in `if` exprs without `else`) - #120751 (Provide more suggestions on invalid equality where bounds) - #120802 (Bail out of drop elaboration when encountering error types) - #120967 (docs: mention round-to-even in precision formatting) - #120973 (allow static_mut_ref in some tests that specifically test mutable statics) - #120974 (llvm-wrapper: adapt for LLVM API change: Add support for EXPORTAS name types) - #120986 (iterator.rs: remove "Basic usage" text) - #120987 (remove redundant logic) - #120988 (fix comment) - #120995 (PassWrapper: adapt for llvm/llvm-project@93cdd1b5cfa3735c) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index a2dfebec594..b45706fd1e5 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1801,6 +1801,9 @@ extern "C" LLVMRustResult LLVMRustWriteImportLibrary( std::string{}, // ExtName std::string{}, // SymbolName std::string{}, // AliasTarget +#if LLVM_VERSION_GE(19, 0) + std::string{}, // ExportAs +#endif ordinal, // Ordinal ordinal_present, // Noname false, // Data |