From 135edbf4ba7762ec25e4bfeb04ab17ce893ada23 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Tue, 6 Jul 2021 15:31:38 +0200
Subject: [PATCH] Move LinkerInfo into CrateInfo

---
 src/driver/aot.rs | 4 +---
 src/driver/jit.rs | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/driver/aot.rs b/src/driver/aot.rs
index 6676d88602c4..50fd53481f74 100644
--- a/src/driver/aot.rs
+++ b/src/driver/aot.rs
@@ -4,7 +4,6 @@
 use std::path::PathBuf;
 
 use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
-use rustc_codegen_ssa::back::linker::LinkerInfo;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule, CrateInfo, ModuleKind};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
@@ -296,8 +295,7 @@ pub(crate) fn run_aot(
             allocator_module,
             metadata_module,
             metadata,
-            linker_info: LinkerInfo::new(tcx, crate::target_triple(tcx.sess).to_string()),
-            crate_info: CrateInfo::new(tcx),
+            crate_info: CrateInfo::new(tcx, crate::target_triple(tcx.sess).to_string()),
         },
         work_products,
     ))
diff --git a/src/driver/jit.rs b/src/driver/jit.rs
index 3f96e741d350..04ec01ad2814 100644
--- a/src/driver/jit.rs
+++ b/src/driver/jit.rs
@@ -178,7 +178,7 @@ fn load_imported_symbols_for_jit(tcx: TyCtxt<'_>) -> Vec<(String, *const u8)> {
 
     let mut dylib_paths = Vec::new();
 
-    let crate_info = CrateInfo::new(tcx);
+    let crate_info = CrateInfo::new(tcx, "dummy_target_cpu".to_string());
     let formats = tcx.dependency_formats(());
     let data = &formats
         .iter()