diff options
Diffstat (limited to 'nptl/descr.h')
-rw-r--r-- | nptl/descr.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nptl/descr.h b/nptl/descr.h index 7fd64ecb39..efb25c7479 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -99,7 +99,11 @@ struct pthread #if !TLS_DTV_AT_TP /* This overlaps the TCB as used for TLS without threads (see tls.h). */ tcbhead_t header; -# define p_multiple_threads(descr) (descr)->header.multiple_threads +#elif TLS_MULTIPLE_THREADS_IN_TCB + struct + { + int multiple_threads; + } header; #endif /* This extra padding has no special purpose, and this structure layout @@ -228,21 +232,6 @@ 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))); |