[Glibc-bsd-commits] r5132 - trunk/glibc-ports/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-11-08 17:34:46 +0000 (Fri, 08 Nov 2013)
New Revision: 5132

Modified:
   trunk/glibc-ports/fbtl/ChangeLog
   trunk/glibc-ports/fbtl/pthread_exit.c
   trunk/glibc-ports/fbtl/pthread_setattr_default_np.c
Log:
merge some nptl fixes


Modified: trunk/glibc-ports/fbtl/ChangeLog
===================================================================
--- trunk/glibc-ports/fbtl/ChangeLog	2013-11-08 17:33:38 UTC (rev 5131)
+++ trunk/glibc-ports/fbtl/ChangeLog	2013-11-08 17:34:46 UTC (rev 5132)
@@ -1,3 +1,12 @@
+2013-06-24  Vladimir Nikulichev  <v.nikulichev at gmail.com>
+
+	[BZ #12310]
+	* pthread_exit.c: Add reference to pthread_create.
+
+2013-06-22  Joseph Myers  <joseph at codesourcery.com>
+
+	* pthread_getattr_default_np.c: Include <string.h>.
+
 2013-06-15  Siddhesh Poyarekar  <siddhesh at redhat.com>
 
 	* Versions (libpthread): Add GLIBC_2.18.

Modified: trunk/glibc-ports/fbtl/pthread_exit.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_exit.c	2013-11-08 17:33:38 UTC (rev 5131)
+++ trunk/glibc-ports/fbtl/pthread_exit.c	2013-11-08 17:34:46 UTC (rev 5132)
@@ -29,3 +29,7 @@
   __do_cancel ();
 }
 strong_alias (__pthread_exit, pthread_exit)
+
+/* After a thread terminates, __libc_start_main decrements
+   __nptl_nthreads defined in pthread_create.c.  */
+PTHREAD_STATIC_FN_REQUIRE (pthread_create)

Modified: trunk/glibc-ports/fbtl/pthread_setattr_default_np.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_setattr_default_np.c	2013-11-08 17:33:38 UTC (rev 5131)
+++ trunk/glibc-ports/fbtl/pthread_setattr_default_np.c	2013-11-08 17:34:46 UTC (rev 5132)
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <pthreadP.h>
 #include <assert.h>
+#include <string.h>
 
 int
 pthread_setattr_default_np (const pthread_attr_t *in)