diff options
| author | bors <bors@rust-lang.org> | 2021-11-05 04:35:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-05 04:35:13 +0000 |
| commit | b99bd8f8be49ba9676d3274fdbd06b2d476adfcd (patch) | |
| tree | d5d6436ab391a2b0da3d1772ee75b1f958de8fce /compiler/rustc_codegen_llvm/src | |
| parent | a6162f6c0ff39a6cc8dcb11a456e54f592653cc9 (diff) | |
| parent | 3821ab231b2bdf6c6d6871fec45121c2f8715d1e (diff) | |
| download | rust-b99bd8f8be49ba9676d3274fdbd06b2d476adfcd.tar.gz rust-b99bd8f8be49ba9676d3274fdbd06b2d476adfcd.zip | |
Auto merge of #90598 - JohnTitor:rollup-kz1qioz, r=JohnTitor
Rollup of 9 pull requests
Successful merges:
- #90507 (Suggest `extern crate alloc` when using undeclared module `alloc`)
- #90530 (Simplify js tester a bit)
- #90533 (Add note about x86 instruction prefixes in asm! to unstable book)
- #90537 (Update aarch64 `target_feature` list for LLVM 12.)
- #90544 (Demote metadata load warning to "info".)
- #90554 (Clean up some `-Z unstable-options` in tests.)
- #90556 (Add more text and examples to `carrying_{add|mul}`)
- #90563 (rustbot allow labels)
- #90571 (Fix missing bottom border for headings in sidebar)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index baa257069aa..246bb88885d 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -180,6 +180,7 @@ pub fn to_llvm_feature<'a>(sess: &Session, s: &'a str) -> Vec<&'a str> { ("aarch64", "dpb2") => vec!["ccdp"], ("aarch64", "frintts") => vec!["fptoint"], ("aarch64", "fcma") => vec!["complxnum"], + ("aarch64", "pmuv3") => vec!["perfmon"], (_, s) => vec![s], } } |