about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-03 20:59:09 +0000
committerbors <bors@rust-lang.org>2018-09-03 20:59:09 +0000
commit0f063aef62cc5c02c4ba1edbf83b82f16853594c (patch)
tree9ac7868818dfae679216ea4977161d54f2e2f776
parentcd5c26f0eb48c8f32ea86e9f2434d905ff2cfc74 (diff)
parentbac0eb2f37e13fb3491507a8deaa344afb8e2de9 (diff)
downloadrust-0f063aef62cc5c02c4ba1edbf83b82f16853594c.tar.gz
rust-0f063aef62cc5c02c4ba1edbf83b82f16853594c.zip
Auto merge of #53926 - japaric:arm-features, r=alexcrichton
whitelist some ARM features

required for rust-lang-nursery/stdsimd#557

r? @gnzlbg or @alexcrichton
-rw-r--r--src/librustc_codegen_llvm/llvm_util.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index 9fcc33d82cf..c23f4387df1 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@@ -86,10 +86,14 @@ unsafe fn configure_llvm(sess: &Session) {
 // array, leading to crashes.
 
 const ARM_WHITELIST: &[(&str, Option<&str>)] = &[
+    ("aclass", Some("arm_target_feature")),
     ("mclass", Some("arm_target_feature")),
     ("rclass", Some("arm_target_feature")),
     ("dsp", Some("arm_target_feature")),
     ("neon", Some("arm_target_feature")),
+    ("v5te", Some("arm_target_feature")),
+    ("v6k", Some("arm_target_feature")),
+    ("v6t2", Some("arm_target_feature")),
     ("v7", Some("arm_target_feature")),
     ("vfp2", Some("arm_target_feature")),
     ("vfp3", Some("arm_target_feature")),