diff options
| author | bors <bors@rust-lang.org> | 2021-10-04 20:58:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-04 20:58:57 +0000 |
| commit | 003d8d3f56848b6f3833340e859b089a09aea36a (patch) | |
| tree | 2684f9670ab0a20213c782cf681e637d30095459 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 175b8db73bfd078b4bcd3c28c8d6f51d5895ebf3 (diff) | |
| parent | 9866b090f48fc5f45ca9c80618976e41987fc25d (diff) | |
| download | rust-003d8d3f56848b6f3833340e859b089a09aea36a.tar.gz rust-003d8d3f56848b6f3833340e859b089a09aea36a.zip | |
Auto merge of #89530 - workingjubilee:rollup-ua14iq6, r=workingjubilee
Rollup of 13 pull requests Successful merges: - #83655 ([aarch64] add target feature outline-atomics) - #87091 (implement advance_(back_)_by on more iterators) - #88451 (Fix an ICE caused by type mismatch errors being ignored) - #88452 (VecDeque: improve performance for From<[T; N]>) - #89400 (Improve wording of `map_or_else` docs) - #89407 (Recommend running `cargo clean` in E0514 output) - #89443 (Include the length in BTree hashes) - #89444 (rustdoc: use slice::contains instead of open-coding it) - #89447 (Improve error message for missing angle brackets in `[_]::method`) - #89453 (Consistently use 'supertrait'.) - #89483 (Practice diagnostic message convention) - #89500 (Fix ICE with buffered lint referring to AST node deleted by everybody_loops) - #89508 (Stabilize `const_panic`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -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 c5deb11edd0..b15efcd0dc2 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -416,6 +416,11 @@ pub fn llvm_global_features(sess: &Session) -> Vec<String> { // -Ctarget-features features.extend(sess.opts.cg.target_feature.split(',').flat_map(&filter)); + // FIXME: Move outline-atomics to target definition when earliest supported LLVM is 12. + if get_version() >= (12, 0, 0) && sess.target.llvm_target.contains("aarch64-unknown-linux") { + features.push("+outline-atomics".to_string()); + } + features } |
