bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move LinkerInfo into CrateInfo

Browse source
This commit is contained in:
bjorn3 2021-07-06 15:31:38 +02:00
parent 9a27044f42
commit 323a74779f
7 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_cranelift/src/driver/aot.rs
View file

@ -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,
))

2
compiler/rustc_codegen_cranelift/src/driver/jit.rs
View file

@ -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()