* sysdeps/generic/ldsodefs.h: Remove [! SHARED] conditional from

	_dl_starting_up decl.

diff --git a/ChangeLog b/ChangeLog
index 05f3ad086ee8e81a9e8da7b298d8edb200cdd5d3..abef2ba56d8a6fd32deb280b089144a7ded93da4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-25  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/generic/ldsodefs.h: Remove [! SHARED] conditional from
+       _dl_starting_up decl.
+
 2002-10-20  H.J. Lu  <hjl@gnu.org>
 
        * sysdeps/unix/sysv/linux/configure.in: Don't check

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index a8f006122b2d5d0effece8e58d4a40fa475e953a..92fe6191b98e1c8bab58d64fb97a6fee4430c3c0 100644 (file)
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -313,6 +313,8 @@ struct rtld_global
   EXTERN size_t _dl_tls_static_nelem;
   /* Size of the static TLS block.  */
   EXTERN size_t _dl_tls_static_size;
+  /* Size actually allocated in the static TLS block.  */
+  EXTERN size_t _dl_tls_static_used;
   /* Alignment requirement of the static TLS block.  */
   EXTERN size_t _dl_tls_static_align;
 
@@ -324,6 +326,9 @@ struct rtld_global
 /* Number of additional slots in the dtv allocated.  */
 # define DTV_SURPLUS   (14)
 
+/* The value of _dl_tls_static_size is kept a multiple of this.  */
+# define TLS_STATIC_MIN        (1024)
+
   /* Initial dtv of the main thread, not allocated with normal malloc.  */
   EXTERN void *_dl_initial_dtv;
   /* Generation counter for the dtv.  */
@@ -416,11 +421,10 @@ extern const char _dl_out_of_memory[];
 extern const char _dl_out_of_memory_internal[] attribute_hidden;
 #endif
 
-#ifndef SHARED
 /* Flag set at startup and cleared when the last initializer has run.  */
 extern int _dl_starting_up;
 weak_extern (_dl_starting_up)
-#elif defined IS_IN_rtld
+#ifdef IS_IN_rtld
 extern int _dl_starting_up_internal attribute_hidden;
 #endif