about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-04-29 02:29:56 +0000
committerbors <bors@rust-lang.org>2025-04-29 02:29:56 +0000
commit1b8ab72680f36e783af84c1a3c4f8508572bd9f9 (patch)
tree45a5fa6de1b388f0098b401c8c4daa1727ec56c7 /compiler/rustc_codegen_llvm/src/lib.rs
parent25cdf1f67463c9365d8d83778c933ec7480e940b (diff)
parentbf37847434acfc691553540b5bf0b8cffc09c277 (diff)
downloadrust-1b8ab72680f36e783af84c1a3c4f8508572bd9f9.tar.gz
rust-1b8ab72680f36e783af84c1a3c4f8508572bd9f9.zip
Auto merge of #140415 - ChrisDenton:rollup-r0631fv, r=ChrisDenton
Rollup of 10 pull requests

Successful merges:

 - #139308 (add autodiff inline)
 - #139656 (Stabilize `slice_as_chunks` library feature)
 - #140022 (allow deref patterns to move out of boxes)
 - #140276 (Do not compute type_of for impl item if impl where clauses are unsatisfied)
 - #140302 (Move inline asm check to typeck, properly handle aliases)
 - #140323 (Implement the internal feature `cfg_target_has_reliable_f16_f128`)
 - #140391 (Rename sub_ptr to offset_from_unsigned in docs)
 - #140394 (Make bootstrap git tests more self-contained)
 - #140396 (Workaround for windows-gnu rust-lld test failure)
 - #140402 (only return nested goals for `Certainty::Yes`)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/lib.rs')
-rw-r--r--compiler/rustc_codegen_llvm/src/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
index b2feeacdb46..e8010ec9fc4 100644
--- a/compiler/rustc_codegen_llvm/src/lib.rs
+++ b/compiler/rustc_codegen_llvm/src/lib.rs
@@ -29,7 +29,7 @@ use back::owned_target_machine::OwnedTargetMachine;
 use back::write::{create_informational_target_machine, create_target_machine};
 use context::SimpleCx;
 use errors::{AutoDiffWithoutLTO, ParseTargetMachineConfig};
-use llvm_util::target_features_cfg;
+use llvm_util::target_config;
 use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
 use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule};
@@ -37,7 +37,7 @@ use rustc_codegen_ssa::back::write::{
     CodegenContext, FatLtoInput, ModuleConfig, TargetMachineFactoryConfig, TargetMachineFactoryFn,
 };
 use rustc_codegen_ssa::traits::*;
-use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen};
+use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen, TargetConfig};
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::{DiagCtxtHandle, FatalError};
 use rustc_metadata::EncodedMetadata;
@@ -338,8 +338,8 @@ impl CodegenBackend for LlvmCodegenBackend {
         llvm_util::print_version();
     }
 
-    fn target_features_cfg(&self, sess: &Session) -> (Vec<Symbol>, Vec<Symbol>) {
-        target_features_cfg(sess)
+    fn target_config(&self, sess: &Session) -> TargetConfig {
+        target_config(sess)
     }
 
     fn codegen_crate<'tcx>(