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 /linuxthreads/sysdeps/pthread/bits/libc-lock.h | |
| 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 'linuxthreads/sysdeps/pthread/bits/libc-lock.h')
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/libc-lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h index 217b0be253..cb839fa42e 100644 --- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -97,7 +97,7 @@ typedef pthread_key_t __libc_key_t; #if defined _LIBC && defined IS_IN_libpthread # define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS #else -# ifdef __PIC__ +# if defined __PIC__ || (defined _LIBC && defined SHARED) # define __libc_maybe_call(FUNC, ARGS, ELSE) \ (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \ _fn != NULL ? (*_fn) ARGS : ELSE; })) @@ -106,7 +106,7 @@ typedef pthread_key_t __libc_key_t; (FUNC != NULL ? FUNC ARGS : ELSE) # endif #endif -#if defined _LIBC && !defined NOT_IN_libc && defined __PIC__ +#if defined _LIBC && !defined NOT_IN_libc && defined SHARED # define __libc_maybe_call2(FUNC, ARGS, ELSE) \ ({__libc_pthread_functions.ptr_##FUNC != NULL \ ? __libc_pthread_functions.ptr_##FUNC ARGS : ELSE; }) |