Update.

	* elf/dl-reloc.c (CHECK_STATIC_TLS): Improve error message.

	* elf/dl-open.c (_dl_tls_static_size): Bump to 2048.

diff --git a/ChangeLog b/ChangeLog
index 7991f98b50cd0d9cf0f9bcd9cc803f02d281a9cc..76f453139752cfa9a1e68e390a380ca8c4ce10ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-01-27  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/dl-reloc.c (CHECK_STATIC_TLS): Improve error message.
+
+       * elf/dl-open.c (_dl_tls_static_size): Bump to 2048.
+
        * elf/dl-reloc.c (allocate_static_tls): Avoid arithmetic
        wrap-around in test.
 

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 8e0c3c2929982262ab808fdb2ee6a782fd5c9a15..aadd8f55f69f69ca6846e69353199d31afd0b9e4 100644 (file)
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -37,7 +37,7 @@
 #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 = 576;
+size_t _dl_tls_static_size = 2048;
 #endif
 
 extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 82e205a6f7b7d05922a77395fef4d0bbdefd4315..7d28553eba2dd32cd1728955d9ec4e4a1d9d1ce1 100644 (file)
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -200,7 +200,8 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
       if (__builtin_expect ((sym_map)->l_tls_offset == 0, 0)                 \
          && !allocate_static_tls (sym_map))                                  \
        {                                                                     \
-         errstring = N_("shared object cannot be dlopen()ed");               \
+         errstring = N_("\
+shared object cannot be dlopen()ed: static TLS memory too small");           \
          INTUSE(_dl_signal_error) (0, (map)->l_name, NULL, errstring);       \
        }                                                                     \
     } while (0)