about summary refs log tree commit diff
path: root/compiler/rustc_codegen_ssa
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-07-22 17:45:18 +0000
committerbors <bors@rust-lang.org>2024-07-22 17:45:18 +0000
commit2a1c384f0e44ad01ac5c85f0cd9de58c97981974 (patch)
treecbbe591a5628d02834bec50135264a4dfa6c2a3c /compiler/rustc_codegen_ssa
parent20f23abbecd7ac5e04dd7ccadc29c3824e28a269 (diff)
parentdb368ea938bfa6b974f600ce7a5b1d7eeb0378c0 (diff)
downloadrust-2a1c384f0e44ad01ac5c85f0cd9de58c97981974.tar.gz
rust-2a1c384f0e44ad01ac5c85f0cd9de58c97981974.zip
Auto merge of #128063 - tgross35:rollup-hsxmptf, r=tgross35
Rollup of 9 pull requests

Successful merges:

 - #117932 (Correct rustdoc section where we talk about rustdoc emitting errors on invalid code)
 - #125990 (Rename `deprecated_safe` lint to `deprecated_safe_2024`)
 - #127506 (rustc_target: add known safe s390x target features)
 - #127820 (Rewrite and rename `issue-14698`. `issue-33329` and `issue-107094` `run-make` tests to rmake or ui)
 - #127923 (Use reuse tool 4.0)
 - #128008 (Start using `#[diagnostic::do_not_recommend]` in the standard library)
 - #128036 (add more tests)
 - #128051 (rustdoc: revert spacing change in item-table)
 - #128059 (Add regression test for items list size (#128023))

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa')
-rw-r--r--compiler/rustc_codegen_ssa/src/target_features.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/target_features.rs b/compiler/rustc_codegen_ssa/src/target_features.rs
index cea164df617..e7cee5220d6 100644
--- a/compiler/rustc_codegen_ssa/src/target_features.rs
+++ b/compiler/rustc_codegen_ssa/src/target_features.rs
@@ -82,6 +82,7 @@ pub fn from_target_feature(
                 Some(sym::prfchw_target_feature) => rust_features.prfchw_target_feature,
                 Some(sym::x86_amx_intrinsics) => rust_features.x86_amx_intrinsics,
                 Some(sym::xop_target_feature) => rust_features.xop_target_feature,
+                Some(sym::s390x_target_feature) => rust_features.s390x_target_feature,
                 Some(name) => bug!("unknown target feature gate {}", name),
                 None => true,
             };