Fix compilation.

Author: reitermarkus

library/std/src/sys/unix/freertos/condvar.rs

@@ -10,6 +10,8 @@ pub struct Condvar {
     waiter_list: UnsafeCell<Option<VecDeque<SemaphoreHandle_t>>>,
 }
 
+pub type MovableCondvar = Condvar;
+
 unsafe impl Send for Condvar {}
 unsafe impl Sync for Condvar {}
 

library/std/src/sys/unix/freertos/mutex.rs

@@ -9,6 +9,8 @@ pub struct Mutex {
     initialized: AtomicU8,
 }
 
+pub type MovableMutex = Mutex;
+
 unsafe impl Send for Mutex {}
 unsafe impl Sync for Mutex {}
 
@@ -31,14 +33,14 @@ impl Mutex {
     #[inline]
     unsafe fn atomic_init(&self) {
         loop {
-            match self.initialized.compare_and_swap(UNINITIALIZED, INITIALIZING, SeqCst) {
-                UNINITIALIZED => {
+            match self.initialized.compare_exchange_weak(UNINITIALIZED, INITIALIZING, SeqCst, SeqCst) {
+                Ok(UNINITIALIZED) => {
                     *self.inner.get() = xSemaphoreCreateMutex();
                     debug_assert!(!(*self.inner.get()).is_null());
                     self.initialized.store(INITIALIZED, SeqCst);
                     return;
                 }
-                INITIALIZED => return,
+                Err(INITIALIZED) => return,
                 _ => continue,
             }
         }
@@ -67,14 +69,14 @@ impl Mutex {
     #[inline]
     pub unsafe fn destroy(&self) {
         loop {
-            match self.initialized.compare_and_swap(INITIALIZED, UNINITIALIZING, SeqCst) {
-                INITIALIZED => {
+            match self.initialized.compare_exchange_weak(INITIALIZED, UNINITIALIZING, SeqCst, SeqCst) {
+                Ok(INITIALIZED) => {
                     vSemaphoreDelete(*self.inner.get());
                     *self.inner.get() = ptr::null_mut();
                     self.initialized.store(UNINITIALIZED, SeqCst);
                     return;
                 }
-                UNINITIALIZED => return,
+                Err(UNINITIALIZED) => return,
                 _ => continue,
             }
         }
@@ -111,14 +113,14 @@ impl ReentrantMutex {
     #[inline]
     unsafe fn atomic_init(&self) {
         loop {
-            match self.initialized.compare_and_swap(UNINITIALIZED, INITIALIZING, SeqCst) {
-                UNINITIALIZED => {
+            match self.initialized.compare_exchange_weak(UNINITIALIZED, INITIALIZING, SeqCst, SeqCst) {
+                Ok(UNINITIALIZED) => {
                     *self.inner.get() = xSemaphoreCreateRecursiveMutex();
                     debug_assert!(!(*self.inner.get()).is_null());
                     self.initialized.store(INITIALIZED, SeqCst);
                     return;
                 }
-                INITIALIZED => return,
+                Err(INITIALIZED) => return,
                 _ => continue,
             }
         }
@@ -145,14 +147,14 @@ impl ReentrantMutex {
 
     pub unsafe fn destroy(&self) {
         loop {
-            match self.initialized.compare_and_swap(INITIALIZED, UNINITIALIZING, SeqCst) {
-                INITIALIZED => {
+            match self.initialized.compare_exchange_weak(INITIALIZED, UNINITIALIZING, SeqCst, SeqCst) {
+                Ok(INITIALIZED) => {
                     vSemaphoreDelete(*self.inner.get());
                     *self.inner.get() = ptr::null_mut();
                     self.initialized.store(UNINITIALIZED, SeqCst);
                     return;
                 }
-                UNINITIALIZED => return,
+                Err(UNINITIALIZED) => return,
                 _ => continue,
             }
         }

library/std/src/sys/unix/freertos/thread.rs

@@ -77,12 +77,15 @@ impl Thread {
                         *Box::from_raw(arg as *mut (Arc<Mutex>, Arc<AtomicU8>, Box<dyn FnOnce()>));
 
                     join_mutex.lock();
-                    state.compare_and_swap(PENDING, RUNNING, SeqCst);
+                    let _ = state.compare_exchange(PENDING, RUNNING, SeqCst, SeqCst);
 
                     main();
                     thread_local_dtor::run_dtors();
 
-                    let previous_state = state.compare_and_swap(RUNNING, EXITED, SeqCst);
+                    let previous_state = match state.compare_exchange(RUNNING, EXITED, SeqCst, SeqCst) {
+                      Ok(v) => v,
+                      Err(v) => v,
+                    };
 
                     join_mutex.unlock();
 

library/std/src/sys/unix/fs.rs

@@ -1108,8 +1108,8 @@ pub fn link(original: &Path, link: &Path) -> io::Result<()> {
     let original = cstr(original)?;
     let link = cstr(link)?;
     cfg_if::cfg_if! {
-        if #[cfg(any(target_os = "vxworks", target_os = "redox", target_os = "android"))] {
-            // VxWorks, Redox, and old versions of Android lack `linkat`, so use
+        if #[cfg(any(target_os = "vxworks", target_os = "freertos", target_os = "redox", target_os = "android"))] {
+            // VxWorks, FreeRTOS, Redox, and old versions of Android lack `linkat`, so use
             // `link` instead. POSIX leaves it implementation-defined whether
             // `link` follows symlinks, so rely on the `symlink_hard_link` test
             // in library/std/src/fs/tests.rs to check the behavior.