diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-04-05 00:24:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 00:24:23 +0200 |
| commit | 0d12422f2d82e4ec47d4b85660caed70b78ea44c (patch) | |
| tree | a5c03caf548a3ab25207c025e67c238ed9a57e3a /compiler/rustc_codegen_llvm/src/back/write.rs | |
| parent | 8ad6a443cfee83e1f7d29c9ec0de26143c54a617 (diff) | |
| parent | da66a31572e0f49981d6b958ecdd95397ecf2d3f (diff) | |
| download | rust-0d12422f2d82e4ec47d4b85660caed70b78ea44c.tar.gz rust-0d12422f2d82e4ec47d4b85660caed70b78ea44c.zip | |
Rollup merge of #80525 - devsnek:wasm64, r=nagisa
wasm64 support There is still some upstream llvm work needed before this can land.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index b3551177323..82f3ee07c93 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -170,10 +170,7 @@ pub fn target_machine_factory( // On the wasm target once the `atomics` feature is enabled that means that // we're no longer single-threaded, or otherwise we don't want LLVM to // lower atomic operations to single-threaded operations. - if singlethread - && sess.target.llvm_target.contains("wasm32") - && sess.target_features.contains(&sym::atomics) - { + if singlethread && sess.target.is_like_wasm && sess.target_features.contains(&sym::atomics) { singlethread = false; } |