From 828d4ace4dee856b376fa44cc095d490ee799c30 Mon Sep 17 00:00:00 2001
From: Linus Färnstrand <faern@faern.net>
Date: Fri, 20 Nov 2020 22:27:50 +0100
Subject: Migrate standard library away from compare_and_swap

---
 library/std/src/sys/sgx/waitqueue/spin_mutex.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'library/std/src/sys/sgx/waitqueue')

diff --git a/library/std/src/sys/sgx/waitqueue/spin_mutex.rs b/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
index d99ce895da5..9140041c584 100644
--- a/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
+++ b/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
@@ -42,7 +42,7 @@ impl<T> SpinMutex<T> {
 
     #[inline(always)]
     pub fn try_lock(&self) -> Option<SpinMutexGuard<'_, T>> {
-        if !self.lock.compare_and_swap(false, true, Ordering::Acquire) {
+        if self.lock.compare_exchange(false, true, Ordering::Acquire, Ordering::Acquire).is_ok() {
             Some(SpinMutexGuard { mutex: self })
         } else {
             None
-- 
cgit 1.4.1-3-g733a5