about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-01 06:25:58 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-01 06:25:58 +0000
commitc1384d107715df7091b40233e252ec327b586bc2 (patch)
treef383b12be1fa58f67a914e16e2dafab377096460
parentf556dbfa418a6898f3be215586ee73411f50afa8 (diff)
downloadglibc-c1384d107715df7091b40233e252ec327b586bc2.tar.gz
glibc-c1384d107715df7091b40233e252ec327b586bc2.tar.xz
glibc-c1384d107715df7091b40233e252ec327b586bc2.zip
Update.
-rw-r--r--ChangeLog4
-rw-r--r--linuxthreads/ChangeLog9
-rw-r--r--linuxthreads/sysdeps/pthread/malloc-machine.h16
3 files changed, 9 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 73aec3d1d6..07c1ad0cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,10 +9,6 @@
 
 2003-09-27  Wolfram Gloger  <wg@malloc.de>
 
-	* sysdeps/pthread/malloc-machine.h: New file.
-
-2003-09-27  Wolfram Gloger  <wg@malloc.de>
-
 	* malloc/malloc.c: Include <malloc-machine.h> earlier instead of
 	"thread-m.h", so that default parameters can be overridden in a
 	system-specific malloc-machine.h.  Remove extra ; from extern "C"
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  <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>
 
 	* 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__));