Skip to content

Commit 07121c8

Browse files
authored
Rollup merge of rust-lang#93745 - tarcieri:stabilize-adx, r=cjgillot
Stabilize ADX target feature This is a continuation of rust-lang#60109, which noted that while the ADX intrinsics were stabilized, the corresponding target feature never was. This PR follows the same general structure and stabilizes the ADX target feature. See also rust-lang#44839 - tracking issue for target feature
2 parents 7e1415e + 78567df commit 07121c8

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

compiler/rustc_codegen_ssa/src/target_features.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ const AARCH64_TIED_FEATURES: &[&[&str]] = &[
148148
];
149149

150150
const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
151-
("adx", Some(sym::adx_target_feature)),
151+
("adx", None),
152152
("aes", None),
153153
("avx", None),
154154
("avx2", None),

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ declare_features! (
5151
/// Allows the sysV64 ABI to be specified on all platforms
5252
/// instead of just the platforms on which it is the C ABI.
5353
(accepted, abi_sysv64, "1.24.0", Some(36167), None),
54+
/// Allows using ADX intrinsics from `core::arch::{x86, x86_64}`.
55+
(accepted, adx_target_feature, "1.61.0", Some(44839), None),
5456
/// Allows the definition of associated constants in `trait` or `impl` blocks.
5557
(accepted, associated_consts, "1.20.0", Some(29646), None),
5658
/// Allows using associated `type`s in `trait`s.

compiler/rustc_typeck/src/collect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2689,7 +2689,6 @@ fn from_target_feature(
26892689
Some(sym::tbm_target_feature) => rust_features.tbm_target_feature,
26902690
Some(sym::wasm_target_feature) => rust_features.wasm_target_feature,
26912691
Some(sym::cmpxchg16b_target_feature) => rust_features.cmpxchg16b_target_feature,
2692-
Some(sym::adx_target_feature) => rust_features.adx_target_feature,
26932692
Some(sym::movbe_target_feature) => rust_features.movbe_target_feature,
26942693
Some(sym::rtm_target_feature) => rust_features.rtm_target_feature,
26952694
Some(sym::f16c_target_feature) => rust_features.f16c_target_feature,

library/core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
//
208208
// Target features:
209209
#![cfg_attr(bootstrap, feature(aarch64_target_feature))]
210-
#![feature(adx_target_feature)]
211210
#![feature(arm_target_feature)]
212211
#![feature(avx512_target_feature)]
213212
#![feature(cmpxchg16b_target_feature)]
@@ -219,6 +218,7 @@
219218
#![feature(sse4a_target_feature)]
220219
#![feature(tbm_target_feature)]
221220
#![feature(wasm_target_feature)]
221+
#![cfg_attr(bootstrap, feature(adx_target_feature))]
222222

223223
// allow using `core::` in intra-doc links
224224
#[allow(unused_extern_crates)]

0 commit comments

Comments
 (0)