fix broken spinlock due to miscompilation

[oweals/musl.git] / src / thread / pthread_mutex_lock.c

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 6696f17a234b7e571ed8ae5210fc273c2b0ad8db..477b3d808175164ed1c1c2b3460b7673d19dce71 100644 (file)
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -3,7 +3,12 @@
 int pthread_mutex_lock(pthread_mutex_t *m)
 {
        int r;
-       while ((r=pthread_mutex_trylock(m)) == EBUSY)
-               __wait(&m->__lock, &m->__waiters, 1, 0);
+       while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+               if (!(r=m->_m_lock) || (r&0x40000000)) continue;
+               if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
+                && (r&0x1fffffff) == pthread_self()->tid)
+                       return EDEADLK;
+               __wait(&m->_m_lock, &m->_m_waiters, r, 0);
+       }
        return r;
 }