about summary refs log tree commit diff
path: root/compiler/rustc_interface/src
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_interface/src
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_interface/src')
-rw-r--r--compiler/rustc_interface/src/util.rs21
1 files changed, 16 insertions, 5 deletions
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs
index c3a939f1ab0..4d346b50c80 100644
--- a/compiler/rustc_interface/src/util.rs
+++ b/compiler/rustc_interface/src/util.rs
@@ -38,14 +38,25 @@ pub(crate) fn add_configuration(
     codegen_backend: &dyn CodegenBackend,
 ) {
     let tf = sym::target_feature;
+    let tf_cfg = codegen_backend.target_config(sess);
 
-    let (target_features, unstable_target_features) = codegen_backend.target_features_cfg(sess);
+    sess.unstable_target_features.extend(tf_cfg.unstable_target_features.iter().copied());
+    sess.target_features.extend(tf_cfg.target_features.iter().copied());
 
-    sess.unstable_target_features.extend(unstable_target_features.iter().copied());
+    cfg.extend(tf_cfg.target_features.into_iter().map(|feat| (tf, Some(feat))));
 
-    sess.target_features.extend(target_features.iter().copied());
-
-    cfg.extend(target_features.into_iter().map(|feat| (tf, Some(feat))));
+    if tf_cfg.has_reliable_f16 {
+        cfg.insert((sym::target_has_reliable_f16, None));
+    }
+    if tf_cfg.has_reliable_f16_math {
+        cfg.insert((sym::target_has_reliable_f16_math, None));
+    }
+    if tf_cfg.has_reliable_f128 {
+        cfg.insert((sym::target_has_reliable_f128, None));
+    }
+    if tf_cfg.has_reliable_f128_math {
+        cfg.insert((sym::target_has_reliable_f128_math, None));
+    }
 
     if sess.crt_static(None) {
         cfg.insert((tf, Some(sym::crt_dash_static)));