Merge in CVS dietlibc 0.21 for IA-64 and X86-64 support. However, drop the

following architectures we currently don't support: arm, mips, mipsel, parisc,
s390, sparc64.

1 files changed, 10 insertions, 11 deletions

diff --git a/mdk-stage1/dietlibc/libpthread/pthread_mutex_lock.c b/mdk-stage1/dietlibc/libpthread/pthread_mutex_lock.c
index 0c3ade9e8..0df2bcd8d 100644
--- a/mdk-stage1/dietlibc/libpthread/pthread_mutex_lock.c
+++ b/mdk-stage1/dietlibc/libpthread/pthread_mutex_lock.c
@@ -15,19 +15,18 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
 
   this = __thread_self();
 
-  if (this!=mutex->owner) {
-    /* wait for mutex to free */
-    __pthread_lock(&(mutex->lock));
-
-    mutex->owner=this;
-  }
-  else if (mutex->kind==PTHREAD_MUTEX_ERRORCHECK_NP)
-  {
-    (*(__errno_location()))=EDEADLK;
-    return -1;
+  if (this==mutex->owner) {
+    if (mutex->kind==PTHREAD_MUTEX_ERRORCHECK_NP)
+      return EDEADLK;
+    if (mutex->kind==PTHREAD_MUTEX_RECURSIVE_NP) {
+      ++(mutex->count);
+      return 0;
+    }
   }
 
-  if (mutex->kind==PTHREAD_MUTEX_RECURSIVE_NP) ++(mutex->count);
+  /* wait for mutex to free */
+  __pthread_lock(&(mutex->lock));
+  mutex->owner=this;
 
   return 0;
 }