@@ -309,12 +309,17 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
meantime. */
if ((oldval & FUTEX_WAITERS) == 0)
{
- if (atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock,
- oldval | FUTEX_WAITERS,
- oldval)
- != 0)
+ int currval = atomic_load_relaxed (&mutex->__data.__lock);
+ if (currval != oldval)
+ {
+ oldval = currval;
+ continue;
+ }
+ int newval = atomic_compare_and_exchange_val_acq
+ (&mutex->__data.__lock, oldval | FUTEX_WAITERS, oldval);
+ if (newval != oldval)
{
- oldval = mutex->__data.__lock;
+ oldval = newval;
continue;
}
oldval |= FUTEX_WAITERS;