r5130 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2012-01-24 08:01:42 +0000 (Tue, 24 Jan 2012)
New Revision: 5130
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-use-thr-primitives.diff
Log:
fixup kfreebsd/local-use-thr-primitives.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-01-23 23:27:10 UTC (rev 5129)
+++ glibc-package/trunk/debian/changelog 2012-01-24 08:01:42 UTC (rev 5130)
@@ -18,6 +18,9 @@
* patches/hurd-i386/submitted-hurd-socket-EAFNOSUPPORT.diff: New patch to
fix error value.
+ [ Petr Salinger ]
+ * fixup kfreebsd/local-use-thr-primitives.diff
+
-- Samuel Thibault <sthibault@debian.org> Tue, 27 Dec 2011 02:02:41 +0100
eglibc (2.13-24) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-use-thr-primitives.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-use-thr-primitives.diff 2012-01-23 23:27:10 UTC (rev 5129)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-use-thr-primitives.diff 2012-01-24 08:01:42 UTC (rev 5130)
@@ -99,7 +99,24 @@
char end_padding[];
--- a/linuxthreads/join.c
+++ b/linuxthreads/join.c
-@@ -89,6 +89,9 @@
+@@ -76,12 +76,15 @@
+ /* If this is the initial thread, block until all threads have terminated.
+ If another thread calls exit, we'll be terminated from our signal
+ handler. */
+- if (self == __pthread_main_thread && __pthread_manager_request >= 0) {
++ if (self == __pthread_main_thread)
++ {
++ if (__pthread_manager_request >= 0) {
+ request.req_thread = self;
+ request.req_kind = REQ_MAIN_THREAD_EXIT;
+ TEMP_FAILURE_RETRY(write_not_cancel(__pthread_manager_request,
+ (char *)&request, sizeof(request)));
+ suspend(self);
++ }
+ /* Main thread flushes stdio streams and runs atexit functions.
+ It also calls a handler within LinuxThreads which sends a process exit
+ request to the thread manager. */
+@@ -89,6 +92,9 @@
}
/* Threads other than the main one terminate without flushing stdio streams
or running atexit functions. */
Reply to: