about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgnzlbg <gnzlbg@users.noreply.github.com>2018-01-28 18:50:03 +0100
committerGitHub <noreply@github.com>2018-01-28 18:50:03 +0100
commitb32dbbc67e4ffa15c3abed2b6329f5029da7671b (patch)
treee2c92004172429475028fc9b4074b4d95f7b6de3
parent5e7fd65419384e5322fe18d3c6ea37e59860a9bc (diff)
downloadrust-b32dbbc67e4ffa15c3abed2b6329f5029da7671b.tar.gz
rust-b32dbbc67e4ffa15c3abed2b6329f5029da7671b.zip
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
-rw-r--r--src/librustc_trans/llvm_util.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_trans/llvm_util.rs b/src/librustc_trans/llvm_util.rs
index 15988008de2..a517c29032d 100644
--- a/src/librustc_trans/llvm_util.rs
+++ b/src/librustc_trans/llvm_util.rs
@@ -79,9 +79,9 @@ unsafe fn configure_llvm(sess: &Session) {
 // detection code will walk past the end of the feature array,
 // leading to crashes.
 
-const ARM_WHITELIST: &'static [&'static str] = &["neon\0", "vfp2\0", "vfp3\0", "vfp4\0"];
+const ARM_WHITELIST: &'static [&'static str] = &["neon\0", "v7\0", "vfp2\0", "vfp3\0", "vfp4\0"];
 
-const AARCH64_WHITELIST: &'static [&'static str] = &["neon\0"];
+const AARCH64_WHITELIST: &'static [&'static str] = &["neon\0", "v7\0"];
 
 const X86_WHITELIST: &'static [&'static str] = &["avx\0", "avx2\0", "bmi\0", "bmi2\0", "sse\0",
                                                  "sse2\0", "sse3\0", "sse4.1\0", "sse4.2\0",