Skip to content

Commit

Permalink
Rollup merge of rust-lang#124033 - bjorn3:ar_archive_writer_0_3_0, r=…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
tgross35 authored Jul 16, 2024
2 parents d0d2e60 + 322c2f6 commit 25dce8f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/archive.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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;

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(
Expand Down

0 comments on commit 25dce8f

Please sign in to comment.