about summary refs log tree commit diff
path: root/csu
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-28 21:58:32 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-28 21:58:32 -0700
commit9655389317c92e5935c47d90c0ba48ca54bd245e (patch)
tree0a083bd6f315f83ff3a269fbbd9b55b82996f745 /csu
parentb0948ffdcbdace63317297d3d3fe2556387dfcbd (diff)
downloadglibc-9655389317c92e5935c47d90c0ba48ca54bd245e.tar.gz
glibc-9655389317c92e5935c47d90c0ba48ca54bd245e.tar.xz
glibc-9655389317c92e5935c47d90c0ba48ca54bd245e.zip
Fix bookkeeping of static TLS block for TLS_TCB_AT_TP architectures.
Diffstat (limited to 'csu')
-rw-r--r--csu/libc-tls.c9
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