about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-12 01:00:56 +0800
committerkennytm <kennytm@gmail.com>2018-04-12 03:23:22 +0800
commitdfdcf6361236442d9f9110d77d9f7e0b5937136c (patch)
treece6cb0de207aadc5921ba5c5c701c58a10e6af6d
parent7a7092846cf69eb4cc08567bada37732daa1050a (diff)
parent5e5374677a642994da2f5c12148abc5f104320e0 (diff)
downloadrust-dfdcf6361236442d9f9110d77d9f7e0b5937136c.tar.gz
rust-dfdcf6361236442d9f9110d77d9f7e0b5937136c.zip
Rollup merge of #49857 - Amanieu:aarch64_fp, r=alexcrichton
Fix "fp" target feature for AArch64

This fixes the following warning on AArch64:
```
'+fp' is not a recognized feature for this target (ignoring feature)
```

Fixes #49782
-rw-r--r--src/librustc_trans/llvm_util.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_trans/llvm_util.rs b/src/librustc_trans/llvm_util.rs
index 1c8f09ce7b3..ad128516a3a 100644
--- a/src/librustc_trans/llvm_util.rs
+++ b/src/librustc_trans/llvm_util.rs
@@ -134,6 +134,7 @@ pub fn to_llvm_feature<'a>(sess: &Session, s: &'a str) -> &'a str {
         ("x86", "pclmulqdq") => "pclmul",
         ("x86", "rdrand") => "rdrnd",
         ("x86", "bmi1") => "bmi",
+        ("aarch64", "fp") => "fp-armv8",
         ("aarch64", "fp16") => "fullfp16",
         (_, s) => s,
     }