diff options
| author | bors <bors@rust-lang.org> | 2021-11-05 22:12:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-05 22:12:31 +0000 |
| commit | d32993afe81a49701edd6f2b8f018020ca50da1a (patch) | |
| tree | 359ab46c3e67e59e847f579fbb0b7745800ff438 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 0d1754e8bf6942b4c1d24d7c923438782129ba5a (diff) | |
| parent | f5f6f73faf7d38b4d4c6cdccd6bd8a12ff23d5be (diff) | |
| download | rust-d32993afe81a49701edd6f2b8f018020ca50da1a.tar.gz rust-d32993afe81a49701edd6f2b8f018020ca50da1a.zip | |
Auto merge of #90631 - matthiaskrgr:rollup-a5tzjh3, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #89942 (Reorder `widening_impl`s to make the doc clearer) - #90569 (Fix tests using `only-i686` to use the correct `only-x86` directive) - #90597 (Warn for variables that are no longer captured) - #90623 (Remove more checks for LLVM < 12) - #90626 (Properly register text_direction_codepoint_in_comment lint.) 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, 0 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 246bb88885d..3e0ea92ab81 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -406,11 +406,6 @@ 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 } |