Skip to content

Commit 062ef84

Browse files
authored
Rollup merge of rust-lang#124033 - bjorn3:ar_archive_writer_0_3_0, r=davidtwco
Sync ar_archive_writer to LLVM 18.1.3 From LLVM 15.0.0-rc3. This adds support for COFF archives containing Arm64EC object files and has various fixes for AIX big archive files.
2 parents 9a9d5ec + 76f43e6 commit 062ef84

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/archive.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::path::{Path, PathBuf};
22

33
use rustc_codegen_ssa::back::archive::{
4-
get_native_object_symbols, ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder,
4+
ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, DEFAULT_OBJECT_READER,
55
};
66
use rustc_session::Session;
77

@@ -11,7 +11,7 @@ pub(crate) struct ArArchiveBuilderBuilder;
1111

1212
impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder {
1313
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder + 'a> {
14-
Box::new(ArArchiveBuilder::new(sess, get_native_object_symbols))
14+
Box::new(ArArchiveBuilder::new(sess, &DEFAULT_OBJECT_READER))
1515
}
1616

1717
fn create_dll_import_lib(

0 commit comments

Comments
 (0)