]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #47514 - gnzlbg:whitelist_x86_fxsr, r=rkruppe
authorkennytm <kennytm@gmail.com>
Wed, 17 Jan 2018 17:57:32 +0000 (01:57 +0800)
committerGitHub <noreply@github.com>
Wed, 17 Jan 2018 17:57:32 +0000 (01:57 +0800)
whitelist x86 fxsr feature

https://github.com/rust-lang/rust/pull/47223 properly checks that only white-listed features are allowed in combination with `target_feature`, but the `fxsr` feature used by `stdsimd` was not white-listed.

r? @alexcrichton

src/librustc_trans/llvm_util.rs

index 8112a9eeab1ef4d8d622bd5dcfc5a561eccb153e..214fdbded4e90bf74a17a290f3ae676f896abdbb 100644 (file)
@@ -85,7 +85,8 @@ unsafe fn configure_llvm(sess: &Session) {
                                                  "avx512dq\0", "avx512er\0",
                                                  "avx512f\0", "avx512ifma\0",
                                                  "avx512pf\0", "avx512vbmi\0",
-                                                 "avx512vl\0", "avx512vpopcntdq\0", "mmx\0"];
+                                                 "avx512vl\0", "avx512vpopcntdq\0",
+                                                 "mmx\0", "fxsr\0"];
 
 const HEXAGON_WHITELIST: &'static [&'static str] = &["hvx\0", "hvx-double\0"];