Skip to content

Commit

Permalink
Rollup merge of rust-lang#49857 - Amanieu:aarch64_fp, r=alexcrichton
Browse files Browse the repository at this point in the history
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 rust-lang#49782
  • Loading branch information
kennytm committed Apr 11, 2018
2 parents 7a70928 + 5e53746 commit dfdcf63
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/librustc_trans/llvm_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down

0 comments on commit dfdcf63

Please sign in to comment.