about summary refs log tree commit diff
path: root/linuxthreads/mutex.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-05 18:10:14 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-05 18:10:14 +0000
commit172b90bbf6d68cfea568151bff7c1a96b277162b (patch)
tree3c3e70e1efeea09fba3c840440a80a0bff4b64ef /linuxthreads/mutex.c
parent619166175d502f8c71f93bb9ec33db558301cd9d (diff)
downloadglibc-172b90bbf6d68cfea568151bff7c1a96b277162b.tar.gz
glibc-172b90bbf6d68cfea568151bff7c1a96b277162b.tar.xz
glibc-172b90bbf6d68cfea568151bff7c1a96b277162b.zip
Update.
2000-10-05  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/sparc/sparc64/fpu/libm-test-ulps: New file.

2000-10-02  Jakub Jelinek  <jakub@redhat.com>

	* sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all
	remaining xp_pad space.

2000-10-05  Jakub Jelinek  <jakub@redhat.com>

	* elf/dl-close.c (_dl_close): Check imap's l_flags_1 for
	DF_1_NODELETE, not list[i]'s.
Diffstat (limited to 'linuxthreads/mutex.c')
-rw-r--r--linuxthreads/mutex.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/linuxthreads/mutex.c b/linuxthreads/mutex.c
index 9b4a3c7f56..5955c575d9 100644
--- a/linuxthreads/mutex.c
+++ b/linuxthreads/mutex.c
@@ -38,8 +38,20 @@ strong_alias (__pthread_mutex_init, pthread_mutex_init)
 
 int __pthread_mutex_destroy(pthread_mutex_t * mutex)
 {
-  if ((mutex->__m_lock.__status & 1) != 0) return EBUSY;
-  return 0;
+  switch (mutex->__m_kind) {
+  case PTHREAD_MUTEX_ADAPTIVE_NP:
+  case PTHREAD_MUTEX_RECURSIVE_NP:
+    if ((mutex->__m_lock.__status & 1) != 0)
+      return EBUSY;
+    return 0;
+  case PTHREAD_MUTEX_ERRORCHECK_NP:
+  case PTHREAD_MUTEX_TIMED_NP:
+    if (mutex->__m_lock.__status != 0)
+      return EBUSY;
+    return 0;
+  default:
+    return EINVAL;
+  }
 }
 strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy)