4 files changed, 25 insertions, 4 deletions
diff --git a/sysdeps/generic/pt-cond-timedwait.c b/sysdeps/generic/pt-cond-timedwait.c
index 99761f3a..4abeb71c 100644
--- a/sysdeps/generic/pt-cond-timedwait.c
+++ b/sysdeps/generic/pt-cond-timedwait.c
@@ -73,7 +73,28 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
   pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &canceltype);
 
   if (abstime)
-    err = __pthread_timedblock (self, abstime);
+    {
+      error_t err;
+
+      err = __pthread_timedblock (self, abstime);
+      if (err)
+	/* We timed out.  We may need to disconnect ourself from the
+	   waiter queue.
+
+	   FIXME: What do we do if we get a wakeup message before we
+	   disconnect ourself?  It may remain until the next time we
+	   block.  */
+	{
+	  assert (err == ETIMEDOUT);
+
+	  __pthread_spin_lock (&mutex->__lock);
+	  if (self->prevp)
+	    __pthread_dequeue (self);
+	  __pthread_spin_unlock (&mutex->__lock);
+
+	  return err;
+	}
+    }
   else
     {
       err = 0;
diff --git a/sysdeps/generic/pt-mutex-timedlock.c b/sysdeps/generic/pt-mutex-timedlock.c
index e8c9b466..3603986c 100644
--- a/sysdeps/generic/pt-mutex-timedlock.c
+++ b/sysdeps/generic/pt-mutex-timedlock.c
@@ -114,7 +114,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
 	   disconnect ourself?  It may remain until the next time we
 	   block.  */
 	{
-	  assert (err = ETIMEDOUT);
+	  assert (err == ETIMEDOUT);
 
 	  __pthread_spin_lock (&mutex->__lock);
 	  if (self->prevp)
diff --git a/sysdeps/generic/pt-rwlock-timedrdlock.c b/sysdeps/generic/pt-rwlock-timedrdlock.c
index 3660339b..85cb9468 100644
--- a/sysdeps/generic/pt-rwlock-timedrdlock.c
+++ b/sysdeps/generic/pt-rwlock-timedrdlock.c
@@ -86,7 +86,7 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
 	   disconnect ourself?  It may remain until the next time we
 	   block.  */
 	{
-	  assert (err = ETIMEDOUT);
+	  assert (err == ETIMEDOUT);
 
 	  __pthread_spin_lock (&rwlock->__lock);
 	  if (self->prevp)
diff --git a/sysdeps/generic/pt-rwlock-timedwrlock.c b/sysdeps/generic/pt-rwlock-timedwrlock.c
index 2f732175..edf6413f 100644
--- a/sysdeps/generic/pt-rwlock-timedwrlock.c
+++ b/sysdeps/generic/pt-rwlock-timedwrlock.c
@@ -72,7 +72,7 @@ __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
 	   disconnect ourself?  It may remain until the next time we
 	   block.  */
 	{
-	  assert (err = ETIMEDOUT);
+	  assert (err == ETIMEDOUT);
 
 	  __pthread_spin_lock (&rwlock->__lock);
 	  if (self->prevp)