diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-12-28 14:12:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 14:12:59 +0100 |
| commit | 98d80bda01950b16dfa5e4a1fe7ecec0e24614f6 (patch) | |
| tree | cf1dfa900fba4e2fb2231da88d52c82fd55f2418 /compiler/rustc_codegen_llvm/src | |
| parent | aef92d44e4e83fe7d5ddb741a274754466207402 (diff) | |
| parent | 3a3a23ffc5742885187c84e7db320610c8b352fb (diff) | |
| download | rust-98d80bda01950b16dfa5e4a1fe7ecec0e24614f6.tar.gz rust-98d80bda01950b16dfa5e4a1fe7ecec0e24614f6.zip | |
Rollup merge of #79662 - bjorn3:move_more_code_out_of_codegen_backend, r=oli-obk
Move some more code out of CodegenBackend::{codegen_crate,link}
Kind of a follow up to #77795
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index a58c2fbd8ab..f33464f83da 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -298,21 +298,19 @@ impl CodegenBackend for LlvmCodegenBackend { codegen_results: CodegenResults, outputs: &OutputFilenames, ) -> Result<(), ErrorReported> { + use crate::back::archive::LlvmArchiveBuilder; + use rustc_codegen_ssa::back::link::link_binary; + // Run the linker on any artifacts that resulted from the LLVM run. // This should produce either a finished executable or library. - sess.time("link_crate", || { - use crate::back::archive::LlvmArchiveBuilder; - use rustc_codegen_ssa::back::link::link_binary; - - let target_cpu = crate::llvm_util::target_cpu(sess); - link_binary::<LlvmArchiveBuilder<'_>>( - sess, - &codegen_results, - outputs, - &codegen_results.crate_name.as_str(), - target_cpu, - ); - }); + let target_cpu = crate::llvm_util::target_cpu(sess); + link_binary::<LlvmArchiveBuilder<'_>>( + sess, + &codegen_results, + outputs, + &codegen_results.crate_name.as_str(), + target_cpu, + ); Ok(()) } |
