diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/libpthread_pthreadexit-safety.patch | 39 |
2 files changed, 2 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog index fbfcccfb..15cd508c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ hurd (20080921-1) UNRELEASED; urgency=low + debian/patches/libpthread_spin-lock-inline.patch: Likewise. + debian/patches/lock-memory-clobber.patch: Likewise. + debian/patches/pflocal-port-leak.patch: Likewise. + + debian/patches/libpthread_pthreadexit-safety.patch: Removed, no longer + needed. * debian/hurd.postinst: Install w and ps alternatives links in /bin, not /usr/bin. diff --git a/debian/patches/libpthread_pthreadexit-safety.patch b/debian/patches/libpthread_pthreadexit-safety.patch deleted file mode 100644 index 57dac1f0..00000000 --- a/debian/patches/libpthread_pthreadexit-safety.patch +++ /dev/null @@ -1,39 +0,0 @@ -As documented in pthread_exit(), the joiner has to make sure the thread really -is dead before freeing its stack. - -Note: Neal fixed it another way on 2008-08-16, drop this patch then. - -Index: libpthread/pthread/pt-detach.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-detach.c,v -retrieving revision 1.2 -diff -u -p -r1.2 pt-detach.c ---- libpthread/pthread/pt-detach.c 4 May 2005 16:04:06 -0000 1.2 -+++ libpthread/pthread/pt-detach.c 8 Jul 2008 23:25:07 -0000 -@@ -58,6 +58,9 @@ pthread_detach (pthread_t thread) - - __pthread_mutex_unlock (&pthread->state_lock); - -+ /* Make sure that the kernel thread is dead. */ -+ __thread_terminate (pthread->kernel_thread); -+ - assert (pthread->stack); - __pthread_stack_dealloc (pthread->stackaddr, pthread->stacksize); - pthread->stack = 0; -Index: libpthread/pthread/pt-join.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-join.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-join.c ---- libpthread/pthread/pt-join.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/pthread/pt-join.c 8 Jul 2008 23:25:07 -0000 -@@ -53,6 +53,9 @@ pthread_join (pthread_t thread, void **s - if (status) - *status = pthread->status; - -+ /* Make sure that the kernel thread is dead. */ -+ __thread_terminate (pthread->kernel_thread); -+ - /* Make sure nobody can reference it anymore, and mark it as - terminated. */ - assert (pthread->stack); |