--- pthread.c	Tue Nov 13 10:39:12 2001
+++ /root/pthread.c	Tue Nov 13 10:39:02 2001
@@ -558,18 +558,18 @@
 	  pid = __clone2(__pthread_manager_event,
 			 (void **) __pthread_manager_thread_bos,
 			 THREAD_MANAGER_STACK_SIZE,
-			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			 (void *)(long)manager_pipe[0]);
+			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+			 __pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #elif _STACK_GROWS_UP
 	  pid = __clone(__pthread_manager_event,
 			(void **) __pthread_manager_thread_bos,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			(void *)(long)manager_pipe[0]);
+			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+			__pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #else
 	  pid = __clone(__pthread_manager_event,
 			(void **) __pthread_manager_thread_tos,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			(void *)(long)manager_pipe[0]);
+			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+			__pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #endif
 
 	  if (pid != -1)
@@ -599,16 +599,16 @@
 #ifdef NEED_SEPARATE_REGISTER_STACK
       pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_bos,
 		     THREAD_MANAGER_STACK_SIZE,
-		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		     (void *)(long)manager_pipe[0]);
+		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+		     __pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #elif _STACK_GROWS_UP
       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_bos,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		    (void *)(long)manager_pipe[0]);
+		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+		    __pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #else
       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_tos,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		    (void *)(long)manager_pipe[0]);
+		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND|
+		    __pthread_sig_cancel,(void *)(long)manager_pipe[0]);
 #endif
     }
   if (__builtin_expect (pid, 0) == -1) {
@@ -847,6 +847,12 @@
       waitpid(__pthread_manager_thread.p_pid, NULL, __WCLONE);
     _exit(__pthread_exit_code);
   }
+  else {
+    if (self == __pthread_main_thread) {
+      waitpid(__pthread_manager_thread.p_pid, NULL, __WCLONE);
+      return;
+    }
+  }
   if (__builtin_expect (THREAD_GETMEM(self, p_canceled), 0)
       && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
     if (THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)