1 files changed, 11 insertions, 1 deletions

diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c
index 9ca197efdbec..a05f9145b8df 100644
--- a/lib/libpthread/thread/thr_sig.c
+++ b/lib/libpthread/thread/thr_sig.c
@@ -671,7 +671,6 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
 	 * signal handler to run:
 	 */
 	case PS_COND_WAIT:
-	case PS_JOIN:
 	case PS_MUTEX_WAIT:
 		/*
 		 * Remove the thread from the wait queue.  It will
@@ -681,6 +680,17 @@ thread_sig_add(pthread_t pthread, int sig, int has_args)
 		PTHREAD_WAITQ_REMOVE(pthread);
 		break;
 
+	case PS_JOIN:
+		/*
+		 * Remove the thread from the wait queue.  It will
+		 * be added back to the wait queue once all signal
+		 * handlers have been invoked.
+		 */
+		PTHREAD_WAITQ_REMOVE(pthread);
+		/* Make the thread runnable: */
+		PTHREAD_SET_STATE(pthread, PS_RUNNING);
+		break;
+
 	/*
 	 * States which are interruptible but may need to be removed
 	 * from queues before any signal handler is called.