Skip to content

Commit ce5919f

Browse files
committed
Auto merge of #107707 - calebzulawski:remove-features, r=Amanieu
Remove misleading target feature aliases Fixes #100752. This is a follow up to #103750. These aliases could not be completely removed until rust-lang/stdarch#1355 landed. cc `@Amanieu`
2 parents 63b2ee0 + 47fc132 commit ce5919f

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

compiler/rustc_codegen_llvm/src/llvm_util.rs

-6
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,6 @@ pub fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> SmallVec<[&'a str; 2]
155155
("x86", "rdrand") => smallvec!["rdrnd"],
156156
("x86", "bmi1") => smallvec!["bmi"],
157157
("x86", "cmpxchg16b") => smallvec!["cx16"],
158-
// FIXME: These aliases are misleading, and should be removed before avx512_target_feature is
159-
// stabilized. They must remain until std::arch switches off them.
160-
// rust#100752
161-
("x86", "avx512vaes") => smallvec!["vaes"],
162-
("x86", "avx512gfni") => smallvec!["gfni"],
163-
("x86", "avx512vpclmulqdq") => smallvec!["vpclmulqdq"],
164158
("aarch64", "rcpc2") => smallvec!["rcpc-immo"],
165159
("aarch64", "dpb") => smallvec!["ccpp"],
166160
("aarch64", "dpb2") => smallvec!["ccdp"],

compiler/rustc_codegen_ssa/src/target_features.rs

-3
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,13 @@ const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
173173
("avx512dq", Some(sym::avx512_target_feature)),
174174
("avx512er", Some(sym::avx512_target_feature)),
175175
("avx512f", Some(sym::avx512_target_feature)),
176-
("avx512gfni", Some(sym::avx512_target_feature)),
177176
("avx512ifma", Some(sym::avx512_target_feature)),
178177
("avx512pf", Some(sym::avx512_target_feature)),
179-
("avx512vaes", Some(sym::avx512_target_feature)),
180178
("avx512vbmi", Some(sym::avx512_target_feature)),
181179
("avx512vbmi2", Some(sym::avx512_target_feature)),
182180
("avx512vl", Some(sym::avx512_target_feature)),
183181
("avx512vnni", Some(sym::avx512_target_feature)),
184182
("avx512vp2intersect", Some(sym::avx512_target_feature)),
185-
("avx512vpclmulqdq", Some(sym::avx512_target_feature)),
186183
("avx512vpopcntdq", Some(sym::avx512_target_feature)),
187184
("bmi1", None),
188185
("bmi2", None),

0 commit comments

Comments
 (0)