* elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition.

	* sysdeps/generic/libc-tls.c: Initialize _dl_tls_static_size here.

diff --git a/ChangeLog b/ChangeLog
index a4a15505ba0baa5c8c4a1678a6f98f459b799109..83f8d8009792a36446cd98269426814e623847fd 100644 (file)
--- 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 984f4a4ec65fefc75e9fc5b322245705ad042682..930400c420c4545a7d7157211f0406fb04038faa 100644 (file)
--- 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 bfb6de0f736693aea65db4087d03eec04cef400b..3544e396dae381669b1c3667ab74024c6a7f7c4d 100644 (file)
--- 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.  */