diff options
| author | bors <bors@rust-lang.org> | 2023-03-28 15:18:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-28 15:18:16 +0000 |
| commit | 478cbb42b730ba4739351b72ce2aa928e78e2f81 (patch) | |
| tree | bf25c6aa92d6d0ad61724051f4404c237df72d71 /compiler/rustc_codegen_llvm/src | |
| parent | bf57e8ada6dc62369d1cee7ab055fb4074bd2d10 (diff) | |
| parent | 60ce19d848682b10543934229750cf30ef7af8a6 (diff) | |
| download | rust-478cbb42b730ba4739351b72ce2aa928e78e2f81.tar.gz rust-478cbb42b730ba4739351b72ce2aa928e78e2f81.zip | |
Auto merge of #109692 - Nilstrieb:rollup-hq65rps, r=Nilstrieb
Rollup of 8 pull requests Successful merges: - #91793 (socket ancillary data implementation for FreeBSD (from 13 and above).) - #92284 (Change advance(_back)_by to return the remainder instead of the number of processed elements) - #102472 (stop special-casing `'static` in evaluation) - #108480 (Use Rayon's TLV directly) - #109321 (Erase impl regions when checking for impossible to eagerly monomorphize items) - #109470 (Correctly substitute GAT's type used in `normalize_param_env` in `check_type_bounds`) - #109562 (Update ar_archive_writer to 0.1.3) - #109629 (remove obsolete `givens` from regionck) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index a570f2af0f0..12da21dc477 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -110,7 +110,7 @@ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> { // FIXME use ArArchiveBuilder on most targets again once reading thin archives is // implemented - if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" { + if true { Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() }) } else { Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols)) |