Remove pthread_attr_setstacksize from __aio_create_helper_thread.

(cherry picked from commit 2c3d9ba9a332cecb009b97ebac5bb78a13118c7c)

diff --git a/ChangeLog b/ChangeLog
index d04fb838ddd8173411ab8109d044ce53cfb88175..823736480c6b9d9c0dd7aff8d92a7e27c46e6757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-30  Ryan S. Arnold  <rsa@linux.vnet.ibm.com>
+
+       * nptl/sysdeps/unix/sysv/linux/aio_misc.h
+       (__aio_create_helper_thread): Remove call to
+       pthread_attr_setstacksize () which set the stacksize to
+       PTHREAD_STACK_MIN.  This is too small if large amounts of TLS are in
+       use.  Removing this call effectively sets stacksize to 'default'.
+
 2011-06-28  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/fpu/e_hypot.c: optimizations for POWER5 and POWER6.

diff --git a/nptl/sysdeps/unix/sysv/linux/aio_misc.h b/nptl/sysdeps/unix/sysv/linux/aio_misc.h
index 406d96e86563e7db2dc690da62c2131a273915d3..2bf7c17aed92deb7630396b87b4deb01613bc09e 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/aio_misc.h
+++ b/nptl/sysdeps/unix/sysv/linux/aio_misc.h
@@ -46,8 +46,8 @@ __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *),
   pthread_attr_init (&attr);
   pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
 
-  /* The helper thread needs only very little resources.  */
-  (void) pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
+  /* Don't set the stacksize to PTHREAD_STACK_MIN.  Let it default, otherwise
+     the stack may be too small if TLS is in use.  */
 
   /* Block all signals in the helper thread.  To do this thoroughly we
      temporarily have to block all signals here.  */