diff options
author | Carlos O'Donell <carlos@redhat.com> | 2013-03-01 16:18:08 -0500 |
---|---|---|
committer | Carlos O'Donell <carlos@redhat.com> | 2013-03-01 16:18:08 -0500 |
commit | 4e9b5995775c99e029ed4003aaddb88bfbf8e2cd (patch) | |
tree | 971f5f28317f29e5c3547bffff8c8bde28ba71e8 /csu | |
parent | ace4acc8ace692f64051594afe47efb1135b3c29 (diff) | |
download | glibc-4e9b5995775c99e029ed4003aaddb88bfbf8e2cd.tar.gz glibc-4e9b5995775c99e029ed4003aaddb88bfbf8e2cd.tar.xz glibc-4e9b5995775c99e029ed4003aaddb88bfbf8e2cd.zip |
Revert GLIBC_PTHREAD_DEFAULT_STACKSIZE changes.
This reverts the change that allows the POSIX Thread default stack size to be changed by the environment variable GLIBC_PTHREAD_DEFAULT_STACKSIZE. It has been requested that more discussion happen before this change goes into 2.18.
Diffstat (limited to 'csu')
-rw-r--r-- | csu/libc-start.c | 4 | ||||
-rw-r--r-- | csu/libc-tls.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c index f53f71c975..9c4c01d9fd 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -30,7 +30,7 @@ extern int __libc_multiple_libcs; #include <tls.h> #ifndef SHARED # include <dl-osinfo.h> -extern void __pthread_initialize_minimal (int, char **, char **); +extern void __pthread_initialize_minimal (void); # ifndef THREAD_SET_STACK_GUARD /* Only exported for architectures that don't store the stack guard canary in thread local area. */ @@ -167,7 +167,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), /* Initialize the thread library at least a bit since the libgcc functions are using thread functions if these are available and we need to setup errno. */ - __pthread_initialize_minimal (argc, argv, __environ); + __pthread_initialize_minimal (); /* Set up the stack checker's canary. */ uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 4c20bb5531..5fa39eb8d1 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -243,7 +243,7 @@ _dl_tls_setup (void) not used. */ void __attribute__ ((weak)) -__pthread_initialize_minimal (int argc, char **argv, char **envp) +__pthread_initialize_minimal (void) { __libc_setup_tls (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN); } |