Skip to content

Commit dd4566f

Browse files
committed
Remove cg_llvm/back/link.rs
1 parent 93a3b41 commit dd4566f

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
@@ -71,9 +71,8 @@ use rustc_codegen_utils::codegen_backend::CodegenBackend;
7171
mod error_codes;
7272

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

0 commit comments

Comments
 (0)