diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-10-20 06:59:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-10-20 06:59:57 +0000 |
| commit | b7071f6fc41f4c20510de3683f39e5c8ea8a2e1e (patch) | |
| tree | 852f4f1992a3c9ecbb44b822df6702c7e635fc5a /nptl/init.c | |
| parent | acfebba27b162b3064c616142883541eaef3f725 (diff) | |
Updated to fedora-glibc-20051020T0651
Diffstat (limited to 'nptl/init.c')
| -rw-r--r-- | nptl/init.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/nptl/init.c b/nptl/init.c index de704122d1..6a7fff9959 100644 --- a/nptl/init.c +++ b/nptl/init.c @@ -297,17 +297,22 @@ __pthread_initialize_minimal_internal (void) || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ - __default_stacksize = ARCH_STACK_DEFAULT_SIZE; + limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE; else if (limit.rlim_cur < PTHREAD_STACK_MIN) /* The system limit is unusably small. Use the minimal size acceptable. */ - __default_stacksize = PTHREAD_STACK_MIN; - else - { - /* Round the resource limit up to page size. */ - const uintptr_t pagesz = __sysconf (_SC_PAGESIZE); - __default_stacksize = (limit.rlim_cur + pagesz - 1) & -pagesz; - } + limit.rlim_cur = PTHREAD_STACK_MIN; + + /* Make sure it meets the minimum size that allocate_stack + (allocatestack.c) will demand, which depends on the page size. */ + const uintptr_t pagesz = __sysconf (_SC_PAGESIZE); + const size_t minstack = pagesz * 2 + __static_tls_size + MINIMAL_REST_STACK; + if (limit.rlim_cur < minstack) + limit.rlim_cur = minstack; + + /* Round the resource limit up to page size. */ + limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz; + __default_stacksize = limit.rlim_cur; /* Get the size of the static and alignment requirements for the TLS block. */ |