Index: thread/rthread_libc.c
===================================================================
RCS file: /cvs/src/lib/libc/thread/rthread_libc.c,v
diff -u -p -r1.5 rthread_libc.c
--- thread/rthread_libc.c	13 Jul 2025 00:01:36 -0000	1.5
+++ thread/rthread_libc.c	13 Jul 2025 11:03:36 -0000
@@ -269,35 +269,35 @@ _thread_malloc_reinit(void)
 /*
  * atexit lock
  */
-static _atomic_lock_t atexit_lock = _SPINLOCK_UNLOCKED;
+static struct __cmtx atexit_lock = __CMTX_INITIALIZER();
 
 void
 _thread_atexit_lock(void)
 {
-	_spinlock(&atexit_lock);
+	__cmtx_enter(&atexit_lock);
 }
 
 void
 _thread_atexit_unlock(void)
 {
-	_spinunlock(&atexit_lock);
+	__cmtx_leave(&atexit_lock);
 }
 
 /*
  * atfork lock
  */
-static _atomic_lock_t atfork_lock = _SPINLOCK_UNLOCKED;
+static struct __cmtx atfork_lock = __CMTX_INITIALIZER();
 
 void
 _thread_atfork_lock(void)
 {
-	_spinlock(&atfork_lock);
+	__cmtx_enter(&atfork_lock);
 }
 
 void
 _thread_atfork_unlock(void)
 {
-	_spinunlock(&atfork_lock);
+	__cmtx_leave(&atfork_lock);
 }
 
 /*