about summary refs log tree commit diff
path: root/src/librustc_trans
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-02-28 19:15:43 +0800
committerGitHub <noreply@github.com>2018-02-28 19:15:43 +0800
commitfed0c4201cb838eeeb1152f83fab88afa87ca825 (patch)
tree65509a458d8fb7808cc501d6767b68ff7a08ca11 /src/librustc_trans
parent537f8d6f863ec049a24821f03f5dc8105358cc97 (diff)
parentc133a082a87ac2cb520688e33ed17aa794cab368 (diff)
downloadrust-fed0c4201cb838eeeb1152f83fab88afa87ca825.tar.gz
rust-fed0c4201cb838eeeb1152f83fab88afa87ca825.zip
Rollup merge of #48565 - alexcrichton:rename-bmi, r=cramertj
rustc: Rename `bmi` feature to `bmi1`

This is what [Intel calls it][bmi1] and will [remove a special case][stdsimd]
when verifying intrinsics in stdsimd.

[bmi1]: https://software.intel.com/sites/landingpage/IntrinsicsGuide/#othertechs=BMI1
[stdsimd]: https://github.com/rust-lang-nursery/stdsimd/blob/bed25b2a9f3b28e6ea80de6d87842f739a2e2d58/crates/stdsimd-verify/tests/x86-intel.rs#L252-L258
Diffstat (limited to 'src/librustc_trans')
-rw-r--r--src/librustc_trans/llvm_util.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_trans/llvm_util.rs b/src/librustc_trans/llvm_util.rs
index 6271dcdfb24..00ac9d80245 100644
--- a/src/librustc_trans/llvm_util.rs
+++ b/src/librustc_trans/llvm_util.rs
@@ -87,7 +87,7 @@ const X86_WHITELIST: &'static [&'static str] = &["aes", "avx", "avx2", "avx512bw
                                                  "avx512cd", "avx512dq", "avx512er",
                                                  "avx512f", "avx512ifma", "avx512pf",
                                                  "avx512vbmi", "avx512vl", "avx512vpopcntdq",
-                                                 "bmi", "bmi2", "fma", "fxsr",
+                                                 "bmi1", "bmi2", "fma", "fxsr",
                                                  "lzcnt", "mmx", "pclmulqdq",
                                                  "popcnt", "rdrand", "rdseed",
                                                  "sse", "sse2", "sse3", "sse4.1",
@@ -108,6 +108,7 @@ pub fn to_llvm_feature(s: &str) -> &str {
     match s {
         "pclmulqdq" => "pclmul",
         "rdrand" => "rdrnd",
+        "bmi1" => "bmi",
         s => s,
     }
 }