diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-12-28 09:27:26 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-12-28 09:27:26 +0000 |
| commit | 131fd126cddad8379741597892cdfcd5cab3a49f (patch) | |
| tree | ae4e3dc6182f230ae952cd95fecb2ee20948387b /sysdeps/generic | |
| parent | ca78735936e87a2b72c553636e815bd555c4ef7e (diff) | |
| download | glibc-131fd126cddad8379741597892cdfcd5cab3a49f.tar.gz glibc-131fd126cddad8379741597892cdfcd5cab3a49f.tar.xz glibc-131fd126cddad8379741597892cdfcd5cab3a49f.zip | |
Update.
2002-12-28 Ulrich Drepper <drepper@redhat.com> * descr.h (struct pthread): Move header.data.list to the back of the struct. * sysdeps/i386/tls.h (tcbhead_t): Move list to the back of the struct. (MULTIPLE_THREADS_OFFSET): Adjust offset. (SYSINFO_OFFSEET): Likewise. 2002-12-27 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h (USE_DL_SYSINFO): Define. (DL_SYSINFO_DEFAULT): Cast to uintptr_t to avoid warnings. * sysdeps/unix/sysv/linux/i386/dl-sysdep.h (NEED_DL_SYSINFO, DL_SYSINFO_DEFAULT, DL_SYSINFO_IMPLEMENTATION): Define. (USE_DL_SYSINFO): Undef. 2002-12-22 Jakub Jelinek <jakub@redhat.com> * Makefile (tests-reverse): Use $(objpfx)../libc.so instead of $(common-objpfx)libc.so. * tst-cancel4.c (tf_write, tf_writev): Increase buf sizes so that it is bigger than pipe buffer size even on arches with bigger page size. (tf_usleep): Cast usleep argument to useconds_t to avoid warnings.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/libc-start.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/libc-tls.c | 21 |
2 files changed, 21 insertions, 4 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index 5b2728b8ba..b4c29dd3c8 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -32,7 +32,7 @@ extern void *__libc_stack_end; #ifndef SHARED # include <dl-osinfo.h> extern void __pthread_initialize_minimal (void) -# if !(USE_TLS - 0) +# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP __attribute__ ((weak)) # endif ; @@ -97,7 +97,7 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), we need to setup errno. If there is no thread library and we handle TLS the function is defined in the libc to initialized the TLS handling. */ -# if !(USE_TLS - 0) +# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP if (__pthread_initialize_minimal) # endif __pthread_initialize_minimal (); diff --git a/sysdeps/generic/libc-tls.c b/sysdeps/generic/libc-tls.c index ce1f9d5f07..1461bf8543 100644 --- a/sysdeps/generic/libc-tls.c +++ b/sysdeps/generic/libc-tls.c @@ -135,8 +135,13 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) } if (memsz == 0 && tcbsize <= TLS_INIT_TCB_SIZE) - /* We do not need a TLS block and no thread descriptor. */ - return; + { + /* We do not need a TLS block and no thread descriptor. */ +#ifdef NONTLS_INIT_TP + NONTLS_INIT_TP; +#endif + return; + } /* We have to set up the TCB block which also (possibly) contains @@ -249,4 +254,16 @@ __pthread_initialize_minimal (void) { __libc_setup_tls (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN); } + +#elif defined NONTLS_INIT_TP + +/* This is the minimal initialization function used when libpthread is + not used. */ +void +__attribute__ ((weak)) +__pthread_initialize_minimal (void) +{ + NONTLS_INIT_TP; +} + #endif |