aboutsummaryrefslogtreecommitdiff
path: root/nptl/descr.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-25 09:12:43 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-25 09:12:43 +0000
commit299601a1ef8df4532ded24194c4556e294ab1e6e (patch)
tree7e7338ca0004ce7fdba3e7429677ef0a5786ad8f /nptl/descr.h
parent29bfc9453e2945b476cec5545f8409fd2a2ba886 (diff)
downloadglibc-299601a1ef8df4532ded24194c4556e294ab1e6e.zip
glibc-299601a1ef8df4532ded24194c4556e294ab1e6e.tar.gz
glibc-299601a1ef8df4532ded24194c4556e294ab1e6e.tar.bz2
Update.
2003-04-22 Jakub Jelinek <jakub@redhat.com> * include/link.h (NO_TLS_OFFSET): Define to 0 if not defined. * elf/dl-close.c (_dl_close): Use NO_TLS_OFFSET. * elf/dl-object.c (_dl_new_object): Initialize l_tls_offset to NO_TLS_OFFSET. * elf/rtld.c (_dl_start_final, _dl_start): Likewise. * elf/dl-reloc.c (CHECK_STATIC_TLS): Use NO_TLS_OFFSET. * sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Likewise. * sysdeps/powerpc/dl-tls.h (TLS_TPREL_VALUE): Don't subtract TLS_TCB_SIZE.
Diffstat (limited to 'nptl/descr.h')
-rw-r--r--nptl/descr.h21
1 files changed, 16 insertions, 5 deletions
diff --git a/nptl/descr.h b/nptl/descr.h
index efb25c7..7fd64ec 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -99,11 +99,7 @@ struct pthread
#if !TLS_DTV_AT_TP
/* This overlaps the TCB as used for TLS without threads (see tls.h). */
tcbhead_t header;
-#elif TLS_MULTIPLE_THREADS_IN_TCB
- struct
- {
- int multiple_threads;
- } header;
+# define p_multiple_threads(descr) (descr)->header.multiple_threads
#endif
/* This extra padding has no special purpose, and this structure layout
@@ -232,6 +228,21 @@ struct pthread
size_t stackblock_size;
/* Size of the included guard area. */
size_t guardsize;
+
+#if TLS_DTV_AT_TP && TLS_MULTIPLE_THREADS_IN_TCB
+ /* Must come last. */
+ int __multiple_threads;
+# define p_multiple_threads(descr) \
+ ((union \
+ { \
+ struct pthread s; \
+ struct \
+ { \
+ char dummy[sizeof (struct pthread) - sizeof (int)]; \
+ int multiple_threads; \
+ } m; \
+ } *)(descr)->m.multiple_threads)
+#endif
} __attribute ((aligned (TCB_ALIGNMENT)));