diff options
| author | bors <bors@rust-lang.org> | 2023-04-19 21:21:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-19 21:21:17 +0000 |
| commit | 39c6804b92aa202369e402525cee329556bc1db0 (patch) | |
| tree | 444aa2df0043444225f7e2b7b5c25cd6397359e4 /compiler/rustc_codegen_llvm/src | |
| parent | 9c51cf7e7ffd4ca1b7159657a76e1d4fbab18276 (diff) | |
| parent | 7c8c9cf47015b2776760ccc496554ba0a1ede5e3 (diff) | |
| download | rust-39c6804b92aa202369e402525cee329556bc1db0.tar.gz rust-39c6804b92aa202369e402525cee329556bc1db0.zip | |
Auto merge of #106704 - ecnelises:big_archive, r=bjorn3
Support AIX-style archive type Reading facility of AIX big archive has been supported by `object` since 0.30.0. Writing facility of AIX big archive has already been supported by `ar_archive_writer`, but we need to bump the version to support the new archive type enum.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 09f3fe02165..c95148013eb 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -552,6 +552,7 @@ pub enum ArchiveKind { K_BSD, K_DARWIN, K_COFF, + K_AIXBIG, } // LLVMRustThinLTOData diff --git a/compiler/rustc_codegen_llvm/src/llvm/mod.rs b/compiler/rustc_codegen_llvm/src/llvm/mod.rs index f820e752371..4f5cc575da6 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/mod.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/mod.rs @@ -137,6 +137,7 @@ impl FromStr for ArchiveKind { "bsd" => Ok(ArchiveKind::K_BSD), "darwin" => Ok(ArchiveKind::K_DARWIN), "coff" => Ok(ArchiveKind::K_COFF), + "aix_big" => Ok(ArchiveKind::K_AIXBIG), _ => Err(()), } } |