diff options
| author | bors <bors@rust-lang.org> | 2021-05-12 08:38:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-12 08:38:03 +0000 |
| commit | ac923d94f86a6f7c881ecbedcd0a68d7986a35bd (patch) | |
| tree | b6e833aafaa51f98d96634dd6f5657de2a23e9ea /compiler/rustc_codegen_llvm/src/lib.rs | |
| parent | c1e7e361f7cddd1fe9b3bfef71a6539d2570e4fb (diff) | |
| parent | 163b4801e72a11803a6dcfece2099b11e5a9be76 (diff) | |
| download | rust-ac923d94f86a6f7c881ecbedcd0a68d7986a35bd.tar.gz rust-ac923d94f86a6f7c881ecbedcd0a68d7986a35bd.zip | |
Auto merge of #83610 - bjorn3:driver_cleanup, r=cjgillot
rustc_driver cleanup Best reviewed one commit at a time.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/lib.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index bc35aa72965..91062926788 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -254,13 +254,8 @@ impl CodegenBackend for LlvmCodegenBackend { Box::new(metadata::LlvmMetadataLoader) } - fn provide(&self, providers: &mut ty::query::Providers) { - attributes::provide_both(providers); - } - - fn provide_extern(&self, providers: &mut ty::query::Providers) { - attributes::provide_both(providers); - } + fn provide(&self, _providers: &mut ty::query::Providers) {} + fn provide_extern(&self, _providers: &mut ty::query::Providers) {} fn codegen_crate<'tcx>( &self, @@ -271,6 +266,7 @@ impl CodegenBackend for LlvmCodegenBackend { Box::new(rustc_codegen_ssa::base::codegen_crate( LlvmCodegenBackend(()), tcx, + crate::llvm_util::target_cpu(tcx.sess).to_string(), metadata, need_metadata_module, )) @@ -306,13 +302,11 @@ impl CodegenBackend for LlvmCodegenBackend { // Run the linker on any artifacts that resulted from the LLVM run. // This should produce either a finished executable or library. - 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(()) |
