diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-10 08:50:36 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-10 08:50:36 +0000 |
| commit | d4f64e1ad7d7836fbd9b01f9c5d410db930c38ce (patch) | |
| tree | 9b74633f12b5a6d7d4cd277aa0b68409cb928c18 /nptl/sysdeps/i386 | |
| parent | f9cd7dfd6b27129e677f6526b5f86fbb11030044 (diff) | |
| download | glibc-d4f64e1ad7d7836fbd9b01f9c5d410db930c38ce.tar.gz glibc-d4f64e1ad7d7836fbd9b01f9c5d410db930c38ce.tar.xz glibc-d4f64e1ad7d7836fbd9b01f9c5d410db930c38ce.zip | |
2003-03-10 Roland McGrath <roland@redhat.com>
* allocatestack.c (allocate_stack) [!TLS_MULTIPLE_THREADS_IN_TCB]: Instead of setting PD->multiple_threads, set globals __pthread_multiple_threads and __libc_multiple_threads. * sysdeps/pthread/createthread.c (create_thread): Likewise. * sysdeps/i386/tls.h (TLS_MULTIPLE_THREADS_IN_TCB): Define it. * sysdeps/s390/tls.h (TLS_MULTIPLE_THREADS_IN_TCB): Likewise. * descr.h (struct pthread): Conditionalize first member on [!TLS_DTV_AT_TP]. Replace the `header' member with an anonymous union containing an anonymous tcbhead_t. Move `list' member out. [TLS_MULTIPLE_THREADS_IN_TCB]: Define a `multiple_threads' member. * allocatestack.c: Remove use of `header.data.' prefix. * pthread_create.c: Likewise. * init.c (__pthread_initialize_minimal_internal): Likewise. * sysdeps/pthread/createthread.c (create_thread): Likewise. * sysdeps/i386/tls.h (INSTALL_DTV): Add parens. (THREAD_SELF, THREAD_DTV, INSTALL_NEW_DTV): No `header.data.' prefix. * sysdeps/x86_64/tls.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (SINGLE_THREAD_P): Likewise. * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (SINGLE_THREAD_P): Likewise. * sysdeps/i386/tls.h (tcbhead_t): Remove `list' member. * sysdeps/s390/tls.h (tcbhead_t): Likewise.
Diffstat (limited to 'nptl/sysdeps/i386')
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 9c4c481ccb..5b70586f27 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -44,9 +44,10 @@ typedef struct void *self; /* Pointer to the thread descriptor. */ int multiple_threads; uintptr_t sysinfo; - list_t list; } tcbhead_t; +# define TLS_MULTIPLE_THREADS_IN_TCB 1 + #else /* __ASSEMBLER__ */ # include <tcb-offsets.h> #endif @@ -116,12 +117,12 @@ union user_desc_init /* Install the dtv pointer. The pointer passed is to the element with index -1 which contain the length. */ # define INSTALL_DTV(descr, dtvp) \ - ((tcbhead_t *) (descr))->dtv = dtvp + 1 + ((tcbhead_t *) (descr))->dtv = (dtvp) + 1 /* Install new dtv for current thread. */ -# define INSTALL_NEW_DTV(dtv) \ +# define INSTALL_NEW_DTV(dtvp) \ ({ struct pthread *__pd; \ - THREAD_SETMEM (__pd, header.data.dtvp, dtv); }) + THREAD_SETMEM (__pd, dtv, (dtvp)); }) /* Return dtv of given thread descriptor. */ # define GET_DTV(descr) \ @@ -227,7 +228,7 @@ union user_desc_init /* Return the address of the dtv for the current thread. */ # define THREAD_DTV() \ ({ struct pthread *__pd; \ - THREAD_GETMEM (__pd, header.data.dtvp); }) + THREAD_GETMEM (__pd, dtv); }) /* Return the thread descriptor for the current thread. @@ -239,7 +240,7 @@ union user_desc_init # define THREAD_SELF \ ({ struct pthread *__self; \ asm ("movl %%gs:%c1,%0" : "=r" (__self) \ - : "i" (offsetof (struct pthread, header.data.self))); \ + : "i" (offsetof (struct pthread, self))); \ __self;}) |