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 | 63f239c89f661dc1e1157ab730e71197e55a12f0 (patch) | |
| tree | 7b2cacb34ecee93b12e2bb1c23a84cbe1c988b25 /compiler/rustc_codegen_gcc/src/archive.rs | |
| parent | 16b569057e4d1591b4bee05f10df34000308dedc (diff) | |
| parent | cd3f2f68c042e2957fff85ca89ba10cb0f2f12b3 (diff) | |
| download | rust-63f239c89f661dc1e1157ab730e71197e55a12f0.tar.gz rust-63f239c89f661dc1e1157ab730e71197e55a12f0.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 'compiler/rustc_codegen_gcc/src/archive.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/archive.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/src/archive.rs b/compiler/rustc_codegen_gcc/src/archive.rs index 73ff0c37b66..21676f5dbb6 100644 --- a/compiler/rustc_codegen_gcc/src/archive.rs +++ b/compiler/rustc_codegen_gcc/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( |