aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/generic/ldsodefs.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-10-26 01:04:06 +0000
committerRoland McGrath <roland@gnu.org>2002-10-26 01:04:06 +0000
commitb5b9cfc4258479d722aa2edcbd0528413625dd9c (patch)
tree5fa3e3e66374bb091baabfd5a9299349eb65229f /sysdeps/generic/ldsodefs.h
parentb0ab77c813f870e51dd29a7fc9e048a971026020 (diff)
downloadglibc-b5b9cfc4258479d722aa2edcbd0528413625dd9c.tar
glibc-b5b9cfc4258479d722aa2edcbd0528413625dd9c.tar.gz
glibc-b5b9cfc4258479d722aa2edcbd0528413625dd9c.tar.bz2
glibc-b5b9cfc4258479d722aa2edcbd0528413625dd9c.zip
* sysdeps/generic/ldsodefs.h: Remove [! SHARED] conditional from
_dl_starting_up decl.
Diffstat (limited to 'sysdeps/generic/ldsodefs.h')
-rw-r--r--sysdeps/generic/ldsodefs.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index a8f006122b..92fe6191b9 100644
--- 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