diff options
| author | Roland McGrath <roland@gnu.org> | 2002-11-05 03:01:37 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-11-05 03:01:37 +0000 |
| commit | c56baa872be4a23813de943f90b1808767eb9430 (patch) | |
| tree | 737acf138fbfbf32779bd9a9e02c9c8e7d6a6da7 /sysdeps/generic/dl-tls.c | |
| parent | 2f0f157e1c222a91a74d3a14292c28538972fa63 (diff) | |
| download | glibc-c56baa872be4a23813de943f90b1808767eb9430.tar glibc-c56baa872be4a23813de943f90b1808767eb9430.tar.gz glibc-c56baa872be4a23813de943f90b1808767eb9430.tar.bz2 glibc-c56baa872be4a23813de943f90b1808767eb9430.zip | |
2002-11-03 Roland McGrath <roland@redhat.com>
* sysdeps/generic/ldsodefs.h (struct rtld_global): New member
`_dl_tls_static_used'.
* sysdeps/generic/libc-tls.c (_dl_tls_static_used): New variable.
(__libc_setup_tls): Initialize it. Let the initial value of
_dl_tls_static_size indicate some surplus space in the computed value.
* elf/dl-open.c (_dl_tls_static_size): New variable.
* sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Initialize
_dl_tls_static_used. Add some surplus space into _dl_tls_static_size.
* elf/dl-reloc.c [USE_TLS] (allocate_static_tls): New function.
(CHECK_STATIC_TLS): Use it.
* elf/dl-close.c (_dl_close): Adjust _dl_tls_static_used when the
closed objects occupied a trailing contiguous chunk of static TLS area.
Diffstat (limited to 'sysdeps/generic/dl-tls.c')
| -rw-r--r-- | sysdeps/generic/dl-tls.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c index b92fecbe27..2c68a251b6 100644 --- a/sysdeps/generic/dl-tls.c +++ b/sysdeps/generic/dl-tls.c @@ -31,6 +31,10 @@ # include <dl-tls.h> # include <ldsodefs.h> +/* Amount of excess space to allocate in the static TLS area + to allow dynamic loading of modules defining IE-model TLS data. */ +# define TLS_STATIC_SURPLUS 64 + /* Value used for dtv entries for which the allocation is delayed. */ # define TLS_DTV_UNALLOCATED ((void *) -1l) @@ -150,7 +154,9 @@ _dl_determine_tlsoffset (void) // XXX would invalidate the offsets the linker creates for the LE // XXX model. - GL(dl_tls_static_size) = offset + TLS_TCB_SIZE; + GL(dl_tls_static_used) = offset; + GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS + TLS_TCB_SIZE, + TLS_TCB_ALIGN); # elif TLS_DTV_AT_TP /* The TLS blocks start right after the TCB. */ offset = TLS_TCB_SIZE; @@ -186,7 +192,9 @@ _dl_determine_tlsoffset (void) offset += prev_size; } - GL(dl_tls_static_size) = offset; + GL(dl_tls_static_used) = offset; + GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS, + TLS_TCB_ALIGN); # else # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" # endif |