diff options
| author | Trevor Gross <t.gross35@gmail.com> | 2024-07-16 16:15:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 16:15:13 -0500 |
| commit | 062ef848c79ca340ae764ff8a968ce5bc87b84be (patch) | |
| tree | 5799f68459608d70236d66b52c013216b40fad77 /src | |
| parent | 9a9d5ec6b6572324f97ce90767016b8dcb253160 (diff) | |
| parent | 76f43e6771292ff3f558f6aecdf57c2084e8148a (diff) | |
| download | rust-062ef848c79ca340ae764ff8a968ce5bc87b84be.tar.gz rust-062ef848c79ca340ae764ff8a968ce5bc87b84be.zip | |
Rollup merge of #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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/archive.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/archive.rs b/src/archive.rs index 73ff0c37b66..21676f5dbb6 100644 --- a/src/archive.rs +++ b/src/archive.rs @@ -1,7 +1,7 @@ use std::path::{Path, PathBuf}; use rustc_codegen_ssa::back::archive::{ - get_native_object_symbols, ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, + ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, DEFAULT_OBJECT_READER, }; use rustc_session::Session; @@ -11,7 +11,7 @@ pub(crate) struct ArArchiveBuilderBuilder; impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder { fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder + 'a> { - Box::new(ArArchiveBuilder::new(sess, get_native_object_symbols)) + Box::new(ArArchiveBuilder::new(sess, &DEFAULT_OBJECT_READER)) } fn create_dll_import_lib( |