about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-28 00:50:31 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-28 00:50:31 +0000
commit809cd222384f058b6e59b08016ac5e1dbcf27711 (patch)
tree1c7e1b7ebe11b25e145b58252c287f49a01ac29b
parentb7e033f7be24bc4f2019f949b74f99ed862810d3 (diff)
downloadglibc-809cd222384f058b6e59b08016ac5e1dbcf27711.tar.gz
glibc-809cd222384f058b6e59b08016ac5e1dbcf27711.tar.xz
glibc-809cd222384f058b6e59b08016ac5e1dbcf27711.zip
Update.
	* elf/dl-reloc.c (CHECK_STATIC_TLS): Improve error message.

	* elf/dl-open.c (_dl_tls_static_size): Bump to 2048.
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-open.c2
-rw-r--r--elf/dl-reloc.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7991f98b50..76f4531397 100644
--- 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 8e0c3c2929..aadd8f55f6 100644
--- 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 82e205a6f7..7d28553eba 100644
--- 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)