aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/generic/dl-tls.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-02-23 06:19:23 +0000
committerUlrich Drepper <drepper@redhat.com>2005-02-23 06:19:23 +0000
commit094d3c54ae439a1dc83b6aa44caf81d54cab32e0 (patch)
tree958b93a2e38fd0c7962cdfa0d61f14c59ee91d3d /sysdeps/generic/dl-tls.c
parentf9ab9ba9aba6426845aca1731bd9d9fea089432c (diff)
downloadglibc-094d3c54ae439a1dc83b6aa44caf81d54cab32e0.tar
glibc-094d3c54ae439a1dc83b6aa44caf81d54cab32e0.tar.gz
glibc-094d3c54ae439a1dc83b6aa44caf81d54cab32e0.tar.bz2
glibc-094d3c54ae439a1dc83b6aa44caf81d54cab32e0.zip
* sysdeps/generic/libc-tls.c (static_dtv): Size the same as the
slotinfo array. (__libc_setup_tls_): Initializer length of DTV based on array length. * elf/dl-load.c: Revert last change. * sysdeps/generic/dl-tls.c: Revert last change.
Diffstat (limited to 'sysdeps/generic/dl-tls.c')
-rw-r--r--sysdeps/generic/dl-tls.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
index ee4acb5a64..fdd569b587 100644
--- a/sysdeps/generic/dl-tls.c
+++ b/sysdeps/generic/dl-tls.c
@@ -49,7 +49,7 @@ oom (void)
{
_dl_fatal_printf ("cannot allocate memory for thread-local data: ABORT\n");
}
-
+# endif
size_t
@@ -97,7 +97,6 @@ _dl_next_tls_modid (void)
/* The new index must indeed be exactly one higher than the
previous high. */
assert (result == GL(dl_tls_max_dtv_idx) + 1);
-
/* There is no gap anymore. */
GL(dl_tls_dtv_gaps) = false;
@@ -108,6 +107,7 @@ _dl_next_tls_modid (void)
{
/* No gaps, allocate a new entry. */
nogaps:
+
result = ++GL(dl_tls_max_dtv_idx);
}
@@ -115,6 +115,7 @@ _dl_next_tls_modid (void)
}
+# ifdef SHARED
void
internal_function
_dl_determine_tlsoffset (void)