* pthread.c (__pthread_reset_main_thread) [FLOATING_STACKS]:

	Don't call setrlimit, since we did no prior bogon we need to undo.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index d9a653bc8766cf6be349201b3519adbcca4fe4ec..dc6cf2330a12b1498255cc88ba8558e5d53d8716 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-28  Roland McGrath  <roland@redhat.com>
+
+       * pthread.c (__pthread_reset_main_thread) [FLOATING_STACKS]:
+       Don't call setrlimit, since we did no prior bogon we need to undo.
+
 2002-09-27  Roland McGrath  <roland@redhat.com>
 
        * sysdeps/x86_64/tls.h [__ASSEMBLER__]: Don't include <pt-machine.h>.

diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 69f7634396ab1a42790d336cbe149e7b2380b65e..9281a414c996f3b192a123643d88b33fd4146f1c 100644 (file)
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -1044,7 +1044,6 @@ static void pthread_handle_sigdebug(int sig)
 void __pthread_reset_main_thread(void)
 {
   pthread_descr self = thread_self();
-  struct rlimit limit;
 
   if (__pthread_manager_request != -1) {
     /* Free the thread manager stack */
@@ -1069,11 +1068,19 @@ void __pthread_reset_main_thread(void)
   THREAD_SETMEM(self, p_resp, &_res);
 #endif
 
-  if (getrlimit (RLIMIT_STACK, &limit) == 0
-      && limit.rlim_cur != limit.rlim_max) {
-    limit.rlim_cur = limit.rlim_max;
-    setrlimit(RLIMIT_STACK, &limit);
-  }
+#ifndef FLOATING_STACKS
+  /* This is to undo the setrlimit call in __pthread_init_max_stacksize.
+     XXX This can be wrong if the user set the limit during the run.  */
+ {
+   struct rlimit limit;
+   if (getrlimit (RLIMIT_STACK, &limit) == 0
+       && limit.rlim_cur != limit.rlim_max)
+     {
+       limit.rlim_cur = limit.rlim_max;
+       setrlimit(RLIMIT_STACK, &limit);
+     }
+ }
+#endif
 }
 
 /* Process-wide exec() request */