about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm/back
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2020-06-23 09:41:56 -0700
committerAlex Crichton <alex@alexcrichton.com>2020-06-23 09:41:56 -0700
commit0c2b02536c857b78cd9560e447fa669d4ca2ba3e (patch)
tree797bfbc74da72f42cfe7afd8275e8b2c275a33a9 /src/librustc_codegen_llvm/back
parent1557fb031b272b4c5bfcc7de5df7eddc7b36a584 (diff)
downloadrust-0c2b02536c857b78cd9560e447fa669d4ca2ba3e.tar.gz
rust-0c2b02536c857b78cd9560e447fa669d4ca2ba3e.zip
rustc: Modernize wasm checks for atomics
This commit modernizes how rustc checks for whether the `atomics`
feature is enabled for the wasm target. The `sess.target_features` set
is consulted instead of fiddling around with dealing with various
aspects of LLVM and that syntax.
Diffstat (limited to 'src/librustc_codegen_llvm/back')
-rw-r--r--src/librustc_codegen_llvm/back/write.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs
index 868ce876a81..54271d3dd04 100644
--- a/src/librustc_codegen_llvm/back/write.rs
+++ b/src/librustc_codegen_llvm/back/write.rs
@@ -23,6 +23,7 @@ use rustc_middle::bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{self, Lto, OutputType, Passes, SanitizerSet, SwitchWithOptPath};
 use rustc_session::Session;
+use rustc_span::symbol::sym;
 use rustc_span::InnerSpan;
 use rustc_target::spec::{CodeModel, RelocModel};
 
@@ -140,7 +141,7 @@ pub fn target_machine_factory(
     // lower atomic operations to single-threaded operations.
     if singlethread
         && sess.target.target.llvm_target.contains("wasm32")
-        && features.iter().any(|s| *s == "+atomics")
+        && sess.target_features.contains(&sym::atomics)
     {
         singlethread = false;
     }