From c1384d107715df7091b40233e252ec327b586bc2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 1 Oct 2003 06:25:58 +0000 Subject: Update. --- ChangeLog | 4 ---- linuxthreads/ChangeLog | 9 +++++++++ linuxthreads/sysdeps/pthread/malloc-machine.h | 16 ---------------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73aec3d1d6..07c1ad0cec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,6 @@ * elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO to work around kernel problem. -2003-09-27 Wolfram Gloger - - * sysdeps/pthread/malloc-machine.h: New file. - 2003-09-27 Wolfram Gloger * malloc/malloc.c: Include earlier instead of diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index abd4a4fdd4..27e479deeb 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +2003-09-30 Jakub Jelinek + + * sysdeps/pthread/malloc-machine.h [!__libc_maybe_call2] (mutex_init, + mutex_lock, mutex_trylock, mutex_unlock): Remove. + +2003-09-27 Wolfram Gloger + + * sysdeps/pthread/malloc-machine.h: New file. + 2003-09-18 H.J. Lu * attr.c (__pthread_attr_init_2_1): Double __guardsize size diff --git a/linuxthreads/sysdeps/pthread/malloc-machine.h b/linuxthreads/sysdeps/pthread/malloc-machine.h index 7eff836285..5191f8c779 100644 --- a/linuxthreads/sysdeps/pthread/malloc-machine.h +++ b/linuxthreads/sysdeps/pthread/malloc-machine.h @@ -28,8 +28,6 @@ __libc_lock_define (typedef, mutex_t) -#if defined(__libc_maybe_call2) - #define mutex_init(m) \ __libc_maybe_call2 (pthread_mutex_init, (m, NULL), (*(int *)(m) = 0)) #define mutex_lock(m) \ @@ -40,20 +38,6 @@ __libc_lock_define (typedef, mutex_t) #define mutex_unlock(m) \ __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. */ extern void *__dso_handle __attribute__ ((__weak__)); -- cgit 1.4.1