diff options
| author | kennytm <kennytm@gmail.com> | 2018-01-30 17:10:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 17:10:56 +0800 |
| commit | 16d3fdb752bdc08e18c93a048d2aa965348fd17a (patch) | |
| tree | 2564902806bd53228fe1f29ca9687f50a257a921 | |
| parent | 003254e105ae56bb4c8913b63f184ace32b5dfdd (diff) | |
| parent | b32dbbc67e4ffa15c3abed2b6329f5029da7671b (diff) | |
| download | rust-16d3fdb752bdc08e18c93a048d2aa965348fd17a.tar.gz rust-16d3fdb752bdc08e18c93a048d2aa965348fd17a.zip | |
Rollup merge of #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
| -rw-r--r-- | src/librustc_trans/llvm_util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_trans/llvm_util.rs b/src/librustc_trans/llvm_util.rs index 39ef3db9dc2..843231d376f 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", |