diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
| commit | b870de510d54108c7c839abc17ea1559085e55a3 (patch) | |
| tree | d59aca63c9713ac51b929e388187f6ec0bb1273e /csu | |
| parent | ca2a37b64e0347b400e58da9ca238c9320a55edb (diff) | |
| parent | 78c4ef475d47a2289635f74b726f52defedb4651 (diff) | |
| download | glibc-b870de510d54108c7c839abc17ea1559085e55a3.tar.gz glibc-b870de510d54108c7c839abc17ea1559085e55a3.tar.xz glibc-b870de510d54108c7c839abc17ea1559085e55a3.zip | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/libc-tls.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 0d240ccef9..5a49942861 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -1,5 +1,5 @@ /* Initialization code for TLS in statically linked application. - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -99,6 +99,9 @@ init_static_tls (size_t memsz, size_t align) surplus that permits dynamic loading of modules with IE-model TLS. */ GL(dl_tls_static_size) = roundup (memsz + GL(dl_tls_static_size), TLS_TCB_ALIGN); +#if TLS_TCB_AT_TP + GL(dl_tls_static_size) += TLS_TCB_SIZE; +#endif GL(dl_tls_static_used) = memsz; /* The alignment requirement for the static TLS block. */ GL(dl_tls_static_align) = align; @@ -211,9 +214,7 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) memsz = roundup (memsz, align ?: 1); -#if TLS_TCB_AT_TP - memsz += tcbsize; -#elif TLS_DTV_AT_TP +#if TLS_DTV_AT_TP memsz += tcb_offset; #endif |