about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src/llvm_util.rs
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-11-05 21:12:30 +0100
committerGitHub <noreply@github.com>2021-11-05 21:12:30 +0100
commit9032b9d8768b3fc5b20659d9be5efa518529525b (patch)
tree18785c67010e0cdc470e33f9ba157ee35b4dce6e /compiler/rustc_codegen_llvm/src/llvm_util.rs
parent4b1cb73f1d45f69e0f00a66754616c61b3166c47 (diff)
parent767471edebd292d7b6386ed236e82abef9abc330 (diff)
downloadrust-9032b9d8768b3fc5b20659d9be5efa518529525b.tar.gz
rust-9032b9d8768b3fc5b20659d9be5efa518529525b.zip
Rollup merge of #90623 - cuviper:llvm-12, r=nikic
Remove more checks for LLVM < 12

We already updated the minimum to 12 in #90175, but we missed a few `get_version()` checks.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
-rw-r--r--compiler/rustc_codegen_llvm/src/llvm_util.rs5
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
 }