Skip to content

Commit ba48f6c

Browse files
committed
Remove cg_llvm/back/link.rs
1 parent 2f25075 commit ba48f6c

File tree

2 files changed

+12
-29
lines changed

2 files changed

+12
-29
lines changed

src/librustc_codegen_llvm/back/link.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/librustc_codegen_llvm/lib.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ use rustc_codegen_utils::codegen_backend::CodegenBackend;
7272
mod diagnostics;
7373

7474
mod back {
75-
mod archive;
75+
pub mod archive;
7676
pub mod bytecode;
77-
pub mod link;
7877
pub mod lto;
7978
pub mod write;
8079
}
@@ -328,8 +327,17 @@ impl CodegenBackend for LlvmCodegenBackend {
328327
// This should produce either a finished executable or library.
329328
sess.profiler(|p| p.start_activity(ProfileCategory::Linking, "link_crate"));
330329
time(sess, "linking", || {
331-
back::link::link_binary(sess, &codegen_results,
332-
outputs, &codegen_results.crate_name.as_str());
330+
use rustc_codegen_ssa::back::link::link_binary;
331+
use crate::back::archive::LlvmArchiveBuilder;
332+
333+
let target_cpu = crate::llvm_util::target_cpu(sess);
334+
link_binary::<LlvmArchiveBuilder<'_>>(
335+
sess,
336+
&codegen_results,
337+
outputs,
338+
&codegen_results.crate_name.as_str(),
339+
target_cpu,
340+
);
333341
});
334342
sess.profiler(|p| p.end_activity(ProfileCategory::Linking, "link_crate"));
335343

0 commit comments

Comments
 (0)