diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-11-15 07:26:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-11-15 07:26:22 +0000 |
| commit | fcae3b76f63626b0e587f8e3b40191136e36041b (patch) | |
| tree | 0363ab3496c90bdb8b11e3dd220f22cd73f83777 | |
| parent | 2461e3dc09008fecc21fb5d23b9d76da2640e3f3 (diff) | |
| download | glibc-fcae3b76f63626b0e587f8e3b40191136e36041b.tar.gz glibc-fcae3b76f63626b0e587f8e3b40191136e36041b.tar.xz glibc-fcae3b76f63626b0e587f8e3b40191136e36041b.zip | |
* elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition. cvs/fedora-glibc-20051115T0809
* sysdeps/generic/libc-tls.c: Initialize _dl_tls_static_size here.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-open.c | 6 | ||||
| -rw-r--r-- | 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 <drepper@redhat.com> + + * 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 <drepper@redhat.com> * 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 <dl-dst.h> -#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. */ |