Skip to content

Commit 16d3fdb

Browse files
authored
Rollup merge of rust-lang#47826 - gnzlbg:patch-2, r=alexcrichton
Whitelist v7 feature for ARM and AARCH64. Needed for `v7` features in `coresimd`. See https://github.com/rust-lang-nursery/stdsimd/blob/b2f7be24d5043a88427f9a5258ca9a51ede6d029/coresimd/src/arm/v7.rs#L40 which used to work but doesn't anymore. r? alexcrichton
2 parents 003254e + b32dbbc commit 16d3fdb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/librustc_trans/llvm_util.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ unsafe fn configure_llvm(sess: &Session) {
7979
// detection code will walk past the end of the feature array,
8080
// leading to crashes.
8181

82-
const ARM_WHITELIST: &'static [&'static str] = &["neon\0", "vfp2\0", "vfp3\0", "vfp4\0"];
82+
const ARM_WHITELIST: &'static [&'static str] = &["neon\0", "v7\0", "vfp2\0", "vfp3\0", "vfp4\0"];
8383

84-
const AARCH64_WHITELIST: &'static [&'static str] = &["neon\0"];
84+
const AARCH64_WHITELIST: &'static [&'static str] = &["neon\0", "v7\0"];
8585

8686
const X86_WHITELIST: &'static [&'static str] = &["avx\0", "avx2\0", "bmi\0", "bmi2\0", "sse\0",
8787
"sse2\0", "sse3\0", "sse4.1\0", "sse4.2\0",

0 commit comments

Comments
 (0)