diff options
| author | bors <bors@rust-lang.org> | 2022-05-26 02:00:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-26 02:00:17 +0000 |
| commit | 99c4758747db31ff12e18fa16086b0d34a520f5c (patch) | |
| tree | 7f257793c7d7e32766aea9532a2ed4bd6e9759ea /compiler/rustc_codegen_llvm/src | |
| parent | 464ec64df70e1f6ee64ec2f2b62eae8ff405bef4 (diff) | |
| parent | ef83e689a82682ba9547de1b921d72b5a3d75b30 (diff) | |
| download | rust-99c4758747db31ff12e18fa16086b0d34a520f5c.tar.gz rust-99c4758747db31ff12e18fa16086b0d34a520f5c.zip | |
Auto merge of #97369 - tmiasko:codgen-ssa-atomic-ordering, r=michaelwoerister
rustc_codegen_ssa: cleanup `AtomicOrdering` * Remove unused `NotAtomic` ordering. * Rename `Monotonic` to `Relaxed` - a Rust specific name. * Derive copy and clone.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 37409dbb447..1d9a4655db6 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -381,9 +381,8 @@ pub enum AtomicOrdering { impl AtomicOrdering { pub fn from_generic(ao: rustc_codegen_ssa::common::AtomicOrdering) -> Self { match ao { - rustc_codegen_ssa::common::AtomicOrdering::NotAtomic => AtomicOrdering::NotAtomic, rustc_codegen_ssa::common::AtomicOrdering::Unordered => AtomicOrdering::Unordered, - rustc_codegen_ssa::common::AtomicOrdering::Monotonic => AtomicOrdering::Monotonic, + rustc_codegen_ssa::common::AtomicOrdering::Relaxed => AtomicOrdering::Monotonic, rustc_codegen_ssa::common::AtomicOrdering::Acquire => AtomicOrdering::Acquire, rustc_codegen_ssa::common::AtomicOrdering::Release => AtomicOrdering::Release, rustc_codegen_ssa::common::AtomicOrdering::AcquireRelease => { |