Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

1 files changed, 5 insertions, 16 deletions

diff --git a/mdk-stage1/dietlibc/libpthread/pthread_join.c b/mdk-stage1/dietlibc/libpthread/pthread_join.c
index 5b295bad1..39c076555 100644
--- a/mdk-stage1/dietlibc/libpthread/pthread_join.c
+++ b/mdk-stage1/dietlibc/libpthread/pthread_join.c
@@ -16,35 +16,24 @@ int pthread_join(pthread_t th, void **thread_return)
   j=__find_thread_id(th);
 
   if (j==-1) {
-    (*(__errno_location()))=ESRCH;
-    return -1;
+    return ESRCH;
   }
 
   thread = __get_thread_struct(j);
 
   /* error handling */
   if (thread==0) {
-    (*(__errno_location()))=ESRCH;
-    return -1;
+    return ESRCH;
   }
 
   if (this==thread) {
-    (*(__errno_location()))=EDEADLK;
-    return -1;
+    return EDEADLK;
   }
 
   if (thread->detached || thread->joined) {
-    (*(__errno_location()))=EINVAL;
-    return -1;
+    return EINVAL;
   }
 
-  thread->joined=this;
-  this->join=1;
-
-  while(this->join) __thread_wait_some_time();
-
-  if (thread_return) *thread_return=this->retval;
-
-  return 0;
+  return __thread_join(thread,thread_return);
 }