From fcae3b76f63626b0e587f8e3b40191136e36041b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 15 Nov 2005 07:26:22 +0000 Subject: * elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition. * sysdeps/generic/libc-tls.c: Initialize _dl_tls_static_size here. --- ChangeLog | 5 +++++ elf/dl-open.c | 6 ------ sysdeps/generic/libc-tls.c | 5 +++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4a15505ba..83f8d80097 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-14 Ulrich Drepper + + * elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition. + * sysdeps/generic/libc-tls.c: Initialize _dl_tls_static_size here. + 2005-11-11 Ulrich Drepper * io/Makefile (routines): Add fstatat, fstatat64, fxstatat, fxstatat64, diff --git a/elf/dl-open.c b/elf/dl-open.c index 984f4a4ec6..930400c420 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -35,12 +35,6 @@ #include -#ifndef SHARED -/* Giving this initialized value preallocates some surplus bytes in the - static TLS area, see __libc_setup_tls (libc-tls.c). */ -size_t _dl_tls_static_size = 2048; -#endif - extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum, diff --git a/sysdeps/generic/libc-tls.c b/sysdeps/generic/libc-tls.c index bfb6de0f73..3544e396da 100644 --- a/sysdeps/generic/libc-tls.c +++ b/sysdeps/generic/libc-tls.c @@ -60,8 +60,9 @@ bool _dl_tls_dtv_gaps; struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list; /* Number of modules in the static TLS block. */ size_t _dl_tls_static_nelem; -/* Size of the static TLS block. */ -size_t _dl_tls_static_size; +/* Size of the static TLS block. Giving this initialized value + preallocates some surplus bytes in the static TLS area. */ +size_t _dl_tls_static_size = 2048; /* Size actually allocated in the static TLS block. */ size_t _dl_tls_static_used; /* Alignment requirement of the static TLS block. */ -- cgit v1.2.3