Temporary patch from Thomas Schwinge to fix libpthread bugs. diff --git libpthread/sysdeps/mach/pt-thread-dealloc.c b/sysdeps/mach/pt-thread-dealloc.c index 55d8c4d..0c4a4fc 100644 --- libpthread/sysdeps/mach/pt-thread-dealloc.c +++ libpthread/sysdeps/mach/pt-thread-dealloc.c @@ -38,4 +38,6 @@ __pthread_thread_dealloc (struct __pthread *thread) assert. */ __mach_port_destroy (__mach_task_self (), thread->wakeupmsg.msgh_remote_port); + + thread->have_kernel_resources = 0; } diff --git libpthread/sysdeps/mach/pt-thread-halt.c b/sysdeps/mach/pt-thread-halt.c index 973cde1..a9c3858 100644 --- libpthread/sysdeps/mach/pt-thread-halt.c +++ libpthread/sysdeps/mach/pt-thread-halt.c @@ -32,6 +32,21 @@ void __pthread_thread_halt (struct __pthread *thread) { - error_t err = __thread_terminate (thread->kernel_thread); - assert_perror (err); + if (thread->have_kernel_resources) + { + if (thread == _pthread_self ()) + { + while (1) + { + error_t err = __thread_suspend (thread->kernel_thread); + assert_perror (err); + assert (! "Failed to suspend self."); + } + } + else + { + error_t err = __thread_terminate (thread->kernel_thread); + assert_perror (err); + } + } } --- /dev/null 2007-12-29 19:47:02.000000000 +0000 +++ libpthread/sysdeps/mach/hurd/pt-init-specific.c 2009-04-23 22:46:31.000000000 +0000 @@ -0,0 +1,29 @@ +/* __pthread_init_specific. Mach version. + Copyright (C) 2002, 2009 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include + +error_t +__pthread_init_specific (struct __pthread *thread) +{ + thread->thread_specifics = 0; + thread->have_kernel_resources = 0; + return 0; +}