diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-06 15:31:38 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-06 15:31:38 +0200 |
| commit | 135edbf4ba7762ec25e4bfeb04ab17ce893ada23 (patch) | |
| tree | 48475f9cff1dad578878563ef5029057fe08ceb1 | |
| parent | 6b3a061e947fcb928b94cd5a7db3bdfd225f87b4 (diff) | |
| download | rust-135edbf4ba7762ec25e4bfeb04ab17ce893ada23.tar.gz rust-135edbf4ba7762ec25e4bfeb04ab17ce893ada23.zip | |
Move LinkerInfo into CrateInfo
| -rw-r--r-- | src/driver/aot.rs | 4 | ||||
| -rw-r--r-- | 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 6676d88602c..50fd53481f7 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 3f96e741d35..04ec01ad281 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() |
