This commit is contained in:
Ulrich Drepper 2003-10-01 06:25:58 +00:00
parent f556dbfa41
commit c1384d1077
3 changed files with 9 additions and 20 deletions

View File

@ -7,10 +7,6 @@
* elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO * elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO
to work around kernel problem. to work around kernel problem.
2003-09-27 Wolfram Gloger <wg@malloc.de>
* sysdeps/pthread/malloc-machine.h: New file.
2003-09-27 Wolfram Gloger <wg@malloc.de> 2003-09-27 Wolfram Gloger <wg@malloc.de>
* malloc/malloc.c: Include <malloc-machine.h> earlier instead of * malloc/malloc.c: Include <malloc-machine.h> earlier instead of

View File

@ -1,3 +1,12 @@
2003-09-30 Jakub Jelinek <jakub@redhat.com>
* sysdeps/pthread/malloc-machine.h [!__libc_maybe_call2] (mutex_init,
mutex_lock, mutex_trylock, mutex_unlock): Remove.
2003-09-27 Wolfram Gloger <wg@malloc.de>
* sysdeps/pthread/malloc-machine.h: New file.
2003-09-18 H.J. Lu <hongjiu.lu@intel.com> 2003-09-18 H.J. Lu <hongjiu.lu@intel.com>
* attr.c (__pthread_attr_init_2_1): Double __guardsize size * attr.c (__pthread_attr_init_2_1): Double __guardsize size

View File

@ -28,8 +28,6 @@
__libc_lock_define (typedef, mutex_t) __libc_lock_define (typedef, mutex_t)
#if defined(__libc_maybe_call2)
#define mutex_init(m) \ #define mutex_init(m) \
__libc_maybe_call2 (pthread_mutex_init, (m, NULL), (*(int *)(m) = 0)) __libc_maybe_call2 (pthread_mutex_init, (m, NULL), (*(int *)(m) = 0))
#define mutex_lock(m) \ #define mutex_lock(m) \
@ -40,20 +38,6 @@ __libc_lock_define (typedef, mutex_t)
#define mutex_unlock(m) \ #define mutex_unlock(m) \
__libc_maybe_call2 (pthread_mutex_unlock, (m), (*(int *)(m) = 0)) __libc_maybe_call2 (pthread_mutex_unlock, (m), (*(int *)(m) = 0))
#else
#define mutex_init(m) \
__libc_maybe_call (__pthread_mutex_init, (m, NULL), (*(int *)(m) = 0))
#define mutex_lock(m) \
__libc_maybe_call (__pthread_mutex_lock, (m), ((*(int *)(m) = 1), 0))
#define mutex_trylock(m) \
__libc_maybe_call (__pthread_mutex_trylock, (m), \
(*(int *)(m) ? 1 : ((*(int *)(m) = 1), 0)))
#define mutex_unlock(m) \
__libc_maybe_call (__pthread_mutex_unlock, (m), (*(int *)(m) = 0))
#endif
/* This is defined by newer gcc version unique for each module. */ /* This is defined by newer gcc version unique for each module. */
extern void *__dso_handle __attribute__ ((__weak__)); extern void *__dso_handle __attribute__ ((__weak__));