diff options
| author | bors <bors@rust-lang.org> | 2022-12-02 23:00:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-02 23:00:48 +0000 |
| commit | e526d123aa4703aa7b85c5b8e70c20b5ee0deade (patch) | |
| tree | ad0429b5719974ff56f53bad7067cd3d827b9bc6 /compiler/rustc_codegen_llvm/src | |
| parent | 32e613bbaafee1bcabba48a2257b838f8d1c03d3 (diff) | |
| parent | 8e0d83a70c3b4a6dc98aab8f174d2bd74bfc7c67 (diff) | |
| download | rust-e526d123aa4703aa7b85c5b8e70c20b5ee0deade.tar.gz rust-e526d123aa4703aa7b85c5b8e70c20b5ee0deade.zip | |
Auto merge of #105187 - matthiaskrgr:rollup-nxyxpko, r=matthiaskrgr
Rollup of 7 pull requests
Successful merges:
- #105026 (v8a as default aarch64 target)
- #105033 (sparc-struct-abi: work around new tail-call optimization)
- #105144 (Document normalization methods `At::{normalize,query_normalize}`)
- #105155 (rustdoc: clean up help and settings button CSS)
- #105162 (Properly synthesize `FnSig` value during cycle)
- #105163 (Check lifetime param count in `collect_trait_impl_trait_tys`)
- #105185 (Move `normalize_fn_sig` to `TypeErrCtxt`)
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index c9f5dd0f2c6..2fa602520dc 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -494,6 +494,11 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str .flatten(); features.extend(feats); + // FIXME: Move v8a to target definition list when earliest supported LLVM is 14. + if get_version() >= (14, 0, 0) && sess.target.arch == "aarch64" { + features.push("+v8a".into()); + } + if diagnostics && let Some(f) = check_tied_features(sess, &featsmap) { sess.emit_err(TargetFeatureDisableOrEnable { features: f, |