From 55dbf17bb57c1d05e0cb04c21e43ad3dc7b01858 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 28 Mar 2021 22:14:09 +0200 Subject: [PATCH] Pass target_cpu to LinkerInfo::new instead of link_binary This is one step towards separating the linking code from codegen backends --- src/driver/aot.rs | 2 +- src/lib.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/driver/aot.rs b/src/driver/aot.rs index ed3bdedddce..c7121b93861 100644 --- a/src/driver/aot.rs +++ b/src/driver/aot.rs @@ -295,7 +295,7 @@ pub(super) fn run_aot( metadata_module, metadata, windows_subsystem, - linker_info: LinkerInfo::new(tcx), + linker_info: LinkerInfo::new(tcx, crate::target_triple(tcx.sess).to_string()), crate_info: CrateInfo::new(tcx), }, work_products, diff --git a/src/lib.rs b/src/lib.rs index 720d2a12534..75b7b9bbeb5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -267,13 +267,11 @@ fn link( ) -> Result<(), ErrorReported> { use rustc_codegen_ssa::back::link::link_binary; - let target_cpu = crate::target_triple(sess).to_string(); link_binary::>( sess, &codegen_results, outputs, &codegen_results.crate_name.as_str(), - &target_cpu, ); Ok(()) -- 2.44.0