Merge commit 'refs/top-bases/baseline' into baselinebaseline

84 files changed, 147 insertions, 2169 deletions

diff --git a/sysdeps/generic/bits/pthreadtypes.h b/sysdeps/generic/bits/pthreadtypes.h
index e5cbfd2..70368ff 100644
--- a/sysdeps/generic/bits/pthreadtypes.h
+++ b/sysdeps/generic/bits/pthreadtypes.h
@@ -24,6 +24,6 @@
 #ifndef _BITS_PTHREADTYPES_H
 #define _BITS_PTHREADTYPES_H    1
 
-#include <pthread.h>
+#include <pthread/pthreadtypes.h>
 
 #endif /* bits/pthreadtypes.h */
diff --git a/sysdeps/generic/pt-attr-destroy.c b/sysdeps/generic/pt-attr-destroy.c
index c4b9aa5..b9bd374 100644
--- a/sysdeps/generic/pt-attr-destroy.c
+++ b/sysdeps/generic/pt-attr-destroy.c
@@ -21,7 +21,8 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_destroy (pthread_attr_t *attr)
+__pthread_attr_destroy (pthread_attr_t *attr)
 {
   return 0;
 }
+strong_alias (__pthread_attr_destroy, pthread_attr_destroy);
diff --git a/sysdeps/generic/pt-attr-getdetachstate.c b/sysdeps/generic/pt-attr-getdetachstate.c
index be406f1..b50f913 100644
--- a/sysdeps/generic/pt-attr-getdetachstate.c
+++ b/sysdeps/generic/pt-attr-getdetachstate.c
@@ -21,9 +21,11 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getdetachstate (const pthread_attr_t *attr,
+__pthread_attr_getdetachstate (const pthread_attr_t *attr,
 			     int *detachstate)
 {
   *detachstate = attr->detachstate;
   return 0;
 }
+
+strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate);
diff --git a/sysdeps/generic/pt-attr-getinheritsched.c b/sysdeps/generic/pt-attr-getinheritsched.c
index cca4e3d..7f1f601 100644
--- a/sysdeps/generic/pt-attr-getinheritsched.c
+++ b/sysdeps/generic/pt-attr-getinheritsched.c
@@ -21,9 +21,11 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getinheritsched (const pthread_attr_t *attr,
+__pthread_attr_getinheritsched (const pthread_attr_t *attr,
 			      int *inheritsched)
 {
   *inheritsched = attr->inheritsched;
   return 0;
 }
+
+strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched);
diff --git a/sysdeps/generic/pt-attr-getschedparam.c b/sysdeps/generic/pt-attr-getschedparam.c
index 190cf9d..4519b69 100644
--- a/sysdeps/generic/pt-attr-getschedparam.c
+++ b/sysdeps/generic/pt-attr-getschedparam.c
@@ -24,9 +24,11 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getschedparam (const pthread_attr_t *attr,
+__pthread_attr_getschedparam (const pthread_attr_t *attr,
 			    struct sched_param *param)
 {
   memcpy (param, &attr->schedparam, sizeof *param);
   return 0;
 }
+
+strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam);
diff --git a/sysdeps/generic/pt-attr-getschedpolicy.c b/sysdeps/generic/pt-attr-getschedpolicy.c
index 4349a23..0980bdd 100644
--- a/sysdeps/generic/pt-attr-getschedpolicy.c
+++ b/sysdeps/generic/pt-attr-getschedpolicy.c
@@ -21,9 +21,11 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getschedpolicy (const pthread_attr_t *attr,
+__pthread_attr_getschedpolicy (const pthread_attr_t *attr,
 			     int *policy)
 {
   *policy = attr->schedpolicy;
   return 0;
 }
+
+strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
diff --git a/sysdeps/generic/pt-attr-getscope.c b/sysdeps/generic/pt-attr-getscope.c
index 97198fa..46eb604 100644
--- a/sysdeps/generic/pt-attr-getscope.c
+++ b/sysdeps/generic/pt-attr-getscope.c
@@ -21,9 +21,11 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getscope (const pthread_attr_t *attr,
+__pthread_attr_getscope (const pthread_attr_t *attr,
 		       int *contentionscope)
 {
   *contentionscope = attr->contentionscope;
   return 0;
 }
+
+strong_alias (__pthread_attr_getscope, pthread_attr_getscope);
diff --git a/sysdeps/generic/pt-attr-init.c b/sysdeps/generic/pt-attr-init.c
index 6a930e3..f9eb361 100644
--- a/sysdeps/generic/pt-attr-init.c
+++ b/sysdeps/generic/pt-attr-init.c
@@ -21,8 +21,9 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_init (pthread_attr_t *attr)
+__pthread_attr_init (pthread_attr_t *attr)
 {
   *attr = __pthread_default_attr;
   return 0;
 }
+strong_alias (__pthread_attr_init, pthread_attr_init);
diff --git a/sysdeps/generic/pt-attr-setdetachstate.c b/sysdeps/generic/pt-attr-setdetachstate.c
index 688ba5d..abd6bbb 100644
--- a/sysdeps/generic/pt-attr-setdetachstate.c
+++ b/sysdeps/generic/pt-attr-setdetachstate.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_setdetachstate (pthread_attr_t *attr,
+__pthread_attr_setdetachstate (pthread_attr_t *attr,
 			     int detachstate)
 {
   switch (detachstate)
@@ -36,3 +36,5 @@ pthread_attr_setdetachstate (pthread_attr_t *attr,
 
   return 0;
 }
+
+strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate);
diff --git a/sysdeps/generic/pt-attr-setinheritsched.c b/sysdeps/generic/pt-attr-setinheritsched.c
index e9012c5..9fdbd4e 100644
--- a/sysdeps/generic/pt-attr-setinheritsched.c
+++ b/sysdeps/generic/pt-attr-setinheritsched.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_setinheritsched (pthread_attr_t *attr,
+__pthread_attr_setinheritsched (pthread_attr_t *attr,
 			      int inheritsched)
 {
   switch (inheritsched)
@@ -36,3 +36,5 @@ pthread_attr_setinheritsched (pthread_attr_t *attr,
 
   return 0;
 }
+
+strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched);
diff --git a/sysdeps/generic/pt-attr-setschedparam.c b/sysdeps/generic/pt-attr-setschedparam.c
index 5459f10..2fd1d3a 100644
--- a/sysdeps/generic/pt-attr-setschedparam.c
+++ b/sysdeps/generic/pt-attr-setschedparam.c
@@ -24,7 +24,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_setschedparam (pthread_attr_t *attr,
+__pthread_attr_setschedparam (pthread_attr_t *attr,
 			    const struct sched_param *param)
 {
   if (memcmp (param, &__pthread_default_attr.schedparam,
@@ -36,3 +36,5 @@ pthread_attr_setschedparam (pthread_attr_t *attr,
 
   return ENOTSUP;
 }
+
+strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam);
diff --git a/sysdeps/generic/pt-attr-setschedpolicy.c b/sysdeps/generic/pt-attr-setschedpolicy.c
index e481d04..04e93c9 100644
--- a/sysdeps/generic/pt-attr-setschedpolicy.c
+++ b/sysdeps/generic/pt-attr-setschedpolicy.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_setschedpolicy (pthread_attr_t *attr,
+__pthread_attr_setschedpolicy (pthread_attr_t *attr,
 			     int policy)
 {
   switch (policy)
@@ -40,3 +40,5 @@ pthread_attr_setschedpolicy (pthread_attr_t *attr,
 
   return 0;
 }
+
+strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
diff --git a/sysdeps/generic/pt-attr-setscope.c b/sysdeps/generic/pt-attr-setscope.c
index c74a4f6..d86d7b5 100644
--- a/sysdeps/generic/pt-attr-setscope.c
+++ b/sysdeps/generic/pt-attr-setscope.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_setscope (pthread_attr_t *attr,
+__pthread_attr_setscope (pthread_attr_t *attr,
 		       int contentionscope)
 {
   if (contentionscope == __pthread_default_attr.contentionscope)
@@ -39,3 +39,5 @@ pthread_attr_setscope (pthread_attr_t *attr,
       return EINVAL;
     }
 }
+
+strong_alias (__pthread_attr_setscope, pthread_attr_setscope);
diff --git a/sysdeps/generic/pt-attr.c b/sysdeps/generic/pt-attr.c
index 769f292..e501dc7 100644
--- a/sysdeps/generic/pt-attr.c
+++ b/sysdeps/generic/pt-attr.c
@@ -32,7 +32,7 @@ const struct __pthread_attr __pthread_default_attr =
 #ifdef PAGESIZE
   guardsize: PAGESIZE,
 #else
-  guardsize: 0,
+  guardsize: 1,
 #endif /* PAGESIZE */
   detachstate: PTHREAD_CREATE_JOINABLE,
   inheritsched: PTHREAD_EXPLICIT_SCHED,
diff --git a/sysdeps/generic/pt-cond-brdcast.c b/sysdeps/generic/pt-cond-brdcast.c
index 3f55e33..999cc2d 100644
--- a/sysdeps/generic/pt-cond-brdcast.c
+++ b/sysdeps/generic/pt-cond-brdcast.c
@@ -23,7 +23,7 @@
 
 /* Unblock all threads that are blocked on condition variable COND.  */
 int
-pthread_cond_broadcast (pthread_cond_t *cond)
+__pthread_cond_broadcast (pthread_cond_t *cond)
 {
   struct __pthread *wakeup;
 
@@ -40,3 +40,5 @@ pthread_cond_broadcast (pthread_cond_t *cond)
 
   return 0;
 }
+
+strong_alias (__pthread_cond_broadcast, pthread_cond_broadcast);
diff --git a/sysdeps/generic/pt-cond-destroy.c b/sysdeps/generic/pt-cond-destroy.c
index eba4778..d72ea75 100644
--- a/sysdeps/generic/pt-cond-destroy.c
+++ b/sysdeps/generic/pt-cond-destroy.c
@@ -21,7 +21,9 @@
 #include <pt-internal.h>
 
 int
-pthread_cond_destroy (pthread_cond_t *cond)
+__pthread_cond_destroy (pthread_cond_t *cond)
 {
   return 0;
 }
+
+strong_alias (__pthread_cond_destroy, pthread_cond_destroy);
diff --git a/sysdeps/generic/pt-cond-init.c b/sysdeps/generic/pt-cond-init.c
index b9e9fb7..350f2eb 100644
--- a/sysdeps/generic/pt-cond-init.c
+++ b/sysdeps/generic/pt-cond-init.c
@@ -24,7 +24,7 @@
 #include <pt-internal.h>
 
 int
-pthread_cond_init (pthread_cond_t *cond,
+__pthread_cond_init (pthread_cond_t *cond,
 		   const pthread_condattr_t *attr)
 {
   *cond = (pthread_cond_t) __PTHREAD_COND_INITIALIZER;
@@ -43,3 +43,5 @@ pthread_cond_init (pthread_cond_t *cond,
   *cond->__attr = *attr;
   return 0;
 }
+
+strong_alias (__pthread_cond_init, pthread_cond_init);
diff --git a/sysdeps/generic/pt-cond-signal.c b/sysdeps/generic/pt-cond-signal.c
index c5e1bc1..d7c91e6 100644
--- a/sysdeps/generic/pt-cond-signal.c
+++ b/sysdeps/generic/pt-cond-signal.c
@@ -46,9 +46,11 @@ cond_signal (struct __pthread_cond *cond, int *unblocked)
 /* Unblock at least one of the threads that are blocked on condition
    variable COND.  */
 int
-pthread_cond_signal (pthread_cond_t *cond)
+__pthread_cond_signal (pthread_cond_t *cond)
 {
   int unblocked = 0;
 
   return cond_signal (cond, &unblocked);
 }
+
+strong_alias (__pthread_cond_signal, pthread_cond_signal);
diff --git a/sysdeps/generic/pt-cond-timedwait.c b/sysdeps/generic/pt-cond-timedwait.c
index c10bdb3..56eb1ec 100644
--- a/sysdeps/generic/pt-cond-timedwait.c
+++ b/sysdeps/generic/pt-cond-timedwait.c
@@ -26,13 +26,15 @@ extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
 					      const struct timespec *abstime);
 
 int
-pthread_cond_timedwait (pthread_cond_t *cond,
+__pthread_cond_timedwait (pthread_cond_t *cond,
 			pthread_mutex_t *mutex,
 			const struct timespec *abstime)
 {
   return __pthread_cond_timedwait_internal (cond, mutex, abstime);
 }
 
+strong_alias (__pthread_cond_timedwait, pthread_cond_timedwait);
+
 /* Block on condition variable COND until ABSTIME.  As a GNU
    extension, if ABSTIME is NULL, then wait forever.  MUTEX should be
    held by the calling thread.  On return, MUTEX will be held by the
@@ -44,6 +46,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
 {
   error_t err;
   int canceltype;
+  clockid_t clock_id = __pthread_default_condattr.clock;
 
   void cleanup (void *arg)
     {
@@ -66,6 +69,8 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
   /* Add ourselves to the list of waiters.  */
   __pthread_spin_lock (&cond->__lock);
   __pthread_enqueue (&cond->__queue, self);
+  if (cond->__attr)
+    clock_id = cond->__attr->clock;
   __pthread_spin_unlock (&cond->__lock);
 
   __pthread_mutex_unlock (mutex);
@@ -77,7 +82,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
 
   if (abstime)
     {
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, clock_id);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-cond-wait.c b/sysdeps/generic/pt-cond-wait.c
index a03476d..38a2ae6 100644
--- a/sysdeps/generic/pt-cond-wait.c
+++ b/sysdeps/generic/pt-cond-wait.c
@@ -31,7 +31,9 @@ extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
    calling thread.  On return, MUTEX will be held by the calling
    thread.  */
 int
-pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
+__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
 {
   return __pthread_cond_timedwait_internal (cond, mutex, 0);
 }
+
+strong_alias (__pthread_cond_wait, pthread_cond_wait);
diff --git a/sysdeps/generic/pt-condattr-destroy.c b/sysdeps/generic/pt-condattr-destroy.c
index c8fd71b..9fd55b1 100644
--- a/sysdeps/generic/pt-condattr-destroy.c
+++ b/sysdeps/generic/pt-condattr-destroy.c
@@ -21,7 +21,9 @@
 #include <pt-internal.h>
 
 int
-pthread_condattr_destroy (pthread_condattr_t *cond)
+__pthread_condattr_destroy (pthread_condattr_t *cond)
 {
   return 0;
 }
+
+strong_alias (__pthread_condattr_destroy, pthread_condattr_destroy);
diff --git a/sysdeps/generic/pt-condattr-init.c b/sysdeps/generic/pt-condattr-init.c
index cf9e198..8570fd1 100644
--- a/sysdeps/generic/pt-condattr-init.c
+++ b/sysdeps/generic/pt-condattr-init.c
@@ -21,8 +21,10 @@
 #include <pt-internal.h>
 
 int
-pthread_condattr_init (pthread_condattr_t *attr)
+__pthread_condattr_init (pthread_condattr_t *attr)
 {
   *attr = __pthread_default_condattr;
   return 0;
 }
+
+strong_alias (__pthread_condattr_init, pthread_condattr_init);
diff --git a/sysdeps/generic/pt-condattr-setclock.c b/sysdeps/generic/pt-condattr-setclock.c
index 984c17e..c5a78ef 100644
--- a/sysdeps/generic/pt-condattr-setclock.c
+++ b/sysdeps/generic/pt-condattr-setclock.c
@@ -23,11 +23,30 @@
 int
 pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
 {
-  if (__pthread_default_condattr.clock == clock)
+  /* Only a few clocks are allowed.  CLOCK_REALTIME is always allowed.
+     CLOCK_MONOTONIC only if the kernel has the necessary support.  */
+  if (clock == CLOCK_MONOTONIC)
     {
-      attr->clock = clock;
-      return 0;
+      /* Check whether the clock is available.  */
+      static int avail;
+
+      if (avail == 0)
+	{
+	  struct timespec ts;
+	  int res;
+
+	  res = clock_getres (CLOCK_MONOTONIC, &ts);
+	  avail = res < 0 ? -1 : 1;
+	}
+
+      if (avail < 0)
+	/* Not available.  */
+	return EINVAL;
     }
+  else if (clock != CLOCK_REALTIME)
+    return EINVAL;
+
+  attr->clock = clock;
 
-  return EINVAL;
+  return 0;
 }
diff --git a/sysdeps/generic/pt-equal.c b/sysdeps/generic/pt-equal.c
index 8fbc519..72fc7e6 100644
--- a/sysdeps/generic/pt-equal.c
+++ b/sysdeps/generic/pt-equal.c
@@ -23,7 +23,9 @@
 /* Return true if __T1 and __T2 both name the same thread.  Otherwise,
    false.  */
 int
-pthread_equal (pthread_t __t1, pthread_t __t2)
+__pthread_equal (pthread_t __t1, pthread_t __t2)
 {
   return __t1 == __t2;
 }
+
+strong_alias (__pthread_equal, pthread_equal);
diff --git a/sysdeps/generic/pt-getschedparam.c b/sysdeps/generic/pt-getschedparam.c
index c128d02..6ec45fe 100644
--- a/sysdeps/generic/pt-getschedparam.c
+++ b/sysdeps/generic/pt-getschedparam.c
@@ -21,8 +21,10 @@
 #include <pt-internal.h>
 
 int
-pthread_getschedparam (pthread_t thread, int *policy,
+__pthread_getschedparam (pthread_t thread, int *policy,
 		       struct sched_param *param)
 {
   return ENOSYS;
 }
+
+strong_alias (__pthread_getschedparam, pthread_getschedparam);
diff --git a/sysdeps/generic/pt-mutex-timedlock.c b/sysdeps/generic/pt-mutex-timedlock.c
index 883e50a..48bffaf 100644
--- a/sysdeps/generic/pt-mutex-timedlock.c
+++ b/sysdeps/generic/pt-mutex-timedlock.c
@@ -130,7 +130,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-rwlock-timedrdlock.c b/sysdeps/generic/pt-rwlock-timedrdlock.c
index ba610fa..a110213 100644
--- a/sysdeps/generic/pt-rwlock-timedrdlock.c
+++ b/sysdeps/generic/pt-rwlock-timedrdlock.c
@@ -73,7 +73,7 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-rwlock-timedwrlock.c b/sysdeps/generic/pt-rwlock-timedwrlock.c
index 04eab51..a5cc579 100644
--- a/sysdeps/generic/pt-rwlock-timedwrlock.c
+++ b/sysdeps/generic/pt-rwlock-timedwrlock.c
@@ -59,7 +59,7 @@ __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-setschedparam.c b/sysdeps/generic/pt-setschedparam.c
index a70b079..14aeb0c 100644
--- a/sysdeps/generic/pt-setschedparam.c
+++ b/sysdeps/generic/pt-setschedparam.c
@@ -21,8 +21,10 @@
 #include <pt-internal.h>
 
 int
-pthread_setschedparam (pthread_t thread, int policy,
+__pthread_setschedparam (pthread_t thread, int policy,
 		       const struct sched_param *param)
 {
   return ENOSYS;
 }
+
+strong_alias (__pthread_setschedparam, pthread_setschedparam);
diff --git a/sysdeps/generic/sem-timedwait.c b/sysdeps/generic/sem-timedwait.c
index e34539a..94e6dee 100644
--- a/sysdeps/generic/sem-timedwait.c
+++ b/sysdeps/generic/sem-timedwait.c
@@ -55,7 +55,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, timeout);
+      err = __pthread_timedblock (self, timeout, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/hurd/pt-destroy-specific.c b/sysdeps/hurd/pt-destroy-specific.c
index 23c7fbc..f7896e5 100644
--- a/sysdeps/hurd/pt-destroy-specific.c
+++ b/sysdeps/hurd/pt-destroy-specific.c
@@ -48,7 +48,7 @@ __pthread_destroy_specific (struct __pthread *thread)
 	  void *value;
 
 	  if (__pthread_key_destructors[i] == PTHREAD_KEY_INVALID)
-	    break;
+	    continue;
 
 	  value = hurd_ihash_find (thread->thread_specifics, i);
 	  if (value)
diff --git a/sysdeps/hurd/pt-getspecific.c b/sysdeps/hurd/pt-getspecific.c
index 3060598..71ec63c 100644
--- a/sysdeps/hurd/pt-getspecific.c
+++ b/sysdeps/hurd/pt-getspecific.c
@@ -27,7 +27,9 @@ pthread_getspecific (pthread_key_t key)
 {
   struct __pthread *self;
 
-  assert (key < __pthread_key_count);
+  if (key < 0 || key >= __pthread_key_count
+      || __pthread_key_destructors[key] == PTHREAD_KEY_INVALID)
+    return NULL;
 
   self = _pthread_self ();
   if (! self->thread_specifics)
diff --git a/sysdeps/hurd/pt-key-delete.c b/sysdeps/hurd/pt-key-delete.c
index 2426bb1..9d88647 100644
--- a/sysdeps/hurd/pt-key-delete.c
+++ b/sysdeps/hurd/pt-key-delete.c
@@ -35,8 +35,27 @@ pthread_key_delete (pthread_key_t key)
     err = EINVAL;
   else
     {
+      int i;
+
       __pthread_key_destructors[key] = PTHREAD_KEY_INVALID;
       __pthread_key_invalid_count ++;
+
+      pthread_rwlock_rdlock (&__pthread_threads_lock);
+      for (i = 0; i < __pthread_num_threads; ++i)
+	{
+	  struct __pthread *t;
+
+	  t = __pthread_threads[i];
+
+	  if (t == NULL)
+	    continue;
+
+	  /* Just remove the key, no need to care whether it was
+	     already there. */
+	  if (t->thread_specifics)
+	    hurd_ihash_remove (t->thread_specifics, key);
+	}
+      pthread_rwlock_unlock (&__pthread_threads_lock);
     }
 
   __pthread_mutex_unlock (&__pthread_key_lock);
diff --git a/sysdeps/hurd/pt-setspecific.c b/sysdeps/hurd/pt-setspecific.c
index 89ca4d7..d0b7302 100644
--- a/sysdeps/hurd/pt-setspecific.c
+++ b/sysdeps/hurd/pt-setspecific.c
@@ -28,6 +28,10 @@ pthread_setspecific (pthread_key_t key, const void *value)
   error_t err;
   struct __pthread *self = _pthread_self ();
 
+  if (key < 0 || key >= __pthread_key_count
+      || __pthread_key_destructors[key] == PTHREAD_KEY_INVALID)
+    return EINVAL;
+
   if (! self->thread_specifics)
     {
       err = hurd_ihash_create (&self->thread_specifics, HURD_IHASH_NO_LOCP);
diff --git a/sysdeps/ia32/bits/memory.h b/sysdeps/i386/bits/memory.h
index 932c408..932c408 100644
--- a/sysdeps/ia32/bits/memory.h
+++ b/sysdeps/i386/bits/memory.h
diff --git a/sysdeps/ia32/bits/atomic.h b/sysdeps/i386/bits/pt-atomic.h
index 0dfc1f6..0dfc1f6 100644
--- a/sysdeps/ia32/bits/atomic.h
+++ b/sysdeps/i386/bits/pt-atomic.h
diff --git a/sysdeps/ia32/bits/spin-lock-inline.h b/sysdeps/i386/bits/spin-lock-inline.h
index e5ed3de..e5ed3de 100644
--- a/sysdeps/ia32/bits/spin-lock-inline.h
+++ b/sysdeps/i386/bits/spin-lock-inline.h
diff --git a/sysdeps/ia32/bits/spin-lock.h b/sysdeps/i386/bits/spin-lock.h
index 5ae81e1..5ae81e1 100644
--- a/sysdeps/ia32/bits/spin-lock.h
+++ b/sysdeps/i386/bits/spin-lock.h
diff --git a/sysdeps/ia32/machine-sp.h b/sysdeps/i386/machine-sp.h
index cef6ab7..cef6ab7 100644
--- a/sysdeps/ia32/machine-sp.h
+++ b/sysdeps/i386/machine-sp.h
diff --git a/sysdeps/ia32/pt-machdep.h b/sysdeps/i386/pt-machdep.h
index 6d45636..6d45636 100644
--- a/sysdeps/ia32/pt-machdep.h
+++ b/sysdeps/i386/pt-machdep.h
diff --git a/sysdeps/l4/bits/pthread-np.h b/sysdeps/l4/bits/pthread-np.h
deleted file mode 100644
index 6a02bdc..0000000
--- a/sysdeps/l4/bits/pthread-np.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Non-portable functions. L4 version.
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/*
- * Never include this file directly; use <pthread.h> or <cthreads.h> instead.
- */
-
-#ifndef _BITS_PTHREAD_NP_H
-#define _BITS_PTHREAD_NP_H	1
-
-#include <l4.h>
-
-/* Add the thread TID to the internal kernel thread pool.  */
-extern int pthread_pool_add_np (l4_thread_id_t tid);
-
-/* Get the first thread from the pool.  */
-extern l4_thread_id_t pthread_pool_get_np (void);
-
-#endif /* bits/pthread-np.h */
diff --git a/sysdeps/l4/hurd/bits/pthread-np.h b/sysdeps/l4/hurd/bits/pthread-np.h
deleted file mode 100644
index a90793d..0000000
--- a/sysdeps/l4/hurd/bits/pthread-np.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Non-portable functions. Viengoos version.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/*
- * Never include this file directly; use <pthread.h> or <cthreads.h> instead.
- */
-
-#ifndef _BITS_PTHREAD_NP_H
-#define _BITS_PTHREAD_NP_H	1
-
-#include <hurd/addr.h>
-
-int pthread_setactivity_np (addr_t activity);
-
-#endif /* bits/pthread-np.h */
diff --git a/sysdeps/l4/hurd/ia32/pt-machdep.c b/sysdeps/l4/hurd/ia32/pt-machdep.c
deleted file mode 100644
index dbf5cd7..0000000
--- a/sysdeps/l4/hurd/ia32/pt-machdep.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Machine dependent pthreads code.  Hurd/i386 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Nothing to do.  */
diff --git a/sysdeps/l4/hurd/ia32/pt-setup.c b/sysdeps/l4/hurd/ia32/pt-setup.c
deleted file mode 100644
index 579905c..0000000
--- a/sysdeps/l4/hurd/ia32/pt-setup.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Setup thread stack.  Viengoos/i386 version.
-   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-
-#include <pt-internal.h>
-#include <hurd/thread.h>
-#include <hurd/exceptions.h>
-
-/* The stack layout used on the i386 is:
-
-    -----------------
-   |  ARG            |
-    -----------------
-   |  START_ROUTINE  |
-    -----------------
-   |  Return address |
-    -----------------  <- %ebp
-   |  Frame pointer  |
-    -----------------
-
-  We do the following: setup the stack to return to the entry routine.
-
-  
-*/
-
-/* The stack contains:
-
-    arg
-    start_routine
-    0 <- fake return address
-    C entry_point
-*/
-extern uintptr_t _pthread_entry_point;
-__asm__ ("\n\
-	.globl	_pthread_entry_point, __pthread_entry_point\n\
-_pthread_entry_point:\n\
-__pthread_entry_point:\n\
-	pushl	$0\n\
-	popf\n\
-\n\
-	xor %ebp, %ebp\n\
-	ret\n");
-
-/* Set up the stack for THREAD, such that it appears as if
-   START_ROUTINE and ARG were passed to the new thread's entry-point.
-   Return the stack pointer for the new thread.  We also take the
-   opportunity to install THREAD in our utcb.  */
-static void *
-stack_setup (struct __pthread *thread,
-	     void *(*start_routine)(void *), void *arg,
-	     void (*entry_point)(void *(*)(void *), void *))
-{
-  uintptr_t *top;
-
-  /* Calculate top of the new stack.  */
-  top = (uintptr_t *) ((uintptr_t) thread->stackaddr + thread->stacksize);
-
-  /* Align on 0x10 for MMX operations.  */
-  top = (uintptr_t) top & ~0xf;
-
-  if (start_routine)
-    {
-      /* Set up call frame.  */
-      *--top = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
-      *--top = (uintptr_t) start_routine;
-      *--top = 0;		/* Fake return address.  */
-      *--top = (uintptr_t) entry_point;
-    }
-
-  return top;
-}
-
-int
-__pthread_setup (struct __pthread *thread,
-		 void (*entry_point)(void *(*)(void *), void *),
-		 void *(*start_routine)(void *), void *arg)
-{
-  thread->mcontext.pc = (void *) &_pthread_entry_point;
-  thread->mcontext.sp = (void *) stack_setup (thread, start_routine, arg,
-					      entry_point);
-
-  if (__pthread_num_threads == 1)
-    return 0;
-
-  assert (! ADDR_IS_VOID (thread->exception_area[0]));
-
-  struct exception_page *exception_page = thread->exception_area_va;
-
-  /* SP is set to the end of the exception area minus one word, which
-     is the location of the exception page.  */
-  exception_page->exception_handler_sp
-    = (uintptr_t) thread->exception_area_va + EXCEPTION_AREA_SIZE;
-  exception_page->exception_handler_sp -= sizeof (void *);
-  * (void **) exception_page->exception_handler_sp = thread->exception_area_va;
-
-  exception_page->exception_handler_ip = (uintptr_t) &exception_handler_entry;
-  exception_page->exception_handler_end = (uintptr_t) &exception_handler_end;
-
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c b/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c
deleted file mode 100644
index 37ef821..0000000
--- a/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* signal-dispatch-lowlevel.c - ia32 specific signal handling functions.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Neal H. Walfield <neal@gnu.org>.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 3 of
-   the License, or (at your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pt-internal.h>
-#include <sig-internal.h>
-
-#include <hurd/thread.h>
-#include <pthread.h>
-#include <stdint.h>
-#include <atomic.h>
-
-extern char _signal_dispatch_entry;
-/* - 0(%esp) a pointer to the thread's struct signal_state.
-   - 4(%esp) a pointer to a siginfo_t.
-   - 8(%esp) is a pointer to the ss_flags field (or NULL).
-   - 12(%esp)+4 is the value of the sp when the thread was interrupted (intr_sp)
-     - 0(intr_sp) is the value of the ip when the thread was interrupted.
-   - 16(%esp) - 16 byte register save area
-*/
-__asm__ ("\n\
-	.globl _signal_dispatch_entry\n\
-_signal_dispatch_entry:\n\
-	/* Save caller saved registers (16 bytes).  */\n\
-	mov %eax, 16(%esp)\n\
-	mov %ecx, 16+4(%esp)\n\
-	mov %edx, 16+8(%esp)\n\
-	pushf\n\
-	popl %eax\n\
-	mov %eax, 16+12(%esp)\n\
-\n\
-	/* Reset EFLAGS.  */\n\
-	cld\n\
-	call signal_dispatch\n\
-\n\
-	/* Get the original stack and begin restoration.  */\n\
-	mov 12(%esp), %edx\n\
-\n\
-	/* Move the saved registers to the user stack.  */\n\
-	sub $16, %edx\n\
-	/* eax.  */\n\
-	mov 16+0(%esp), %ecx\n\
-	mov %ecx, 0(%edx)\n\
-	/* ecx.  */\n\
-	mov 16+4(%esp), %ecx\n\
-	mov %ecx, 4(%edx)\n\
-	/* edx.  */\n\
-	mov 16+8(%esp), %ecx\n\
-	mov %ecx, 8(%edx)\n\
-	/* eflags.  */\n\
-	mov 16+12(%esp), %ecx\n\
-	mov %ecx, 12(%edx)\n\
-\n\
-	/* Get the pointer to the sigaltstack flags.  */\n\
-	mov 8(%esp), %ecx\n\
-\n\
-	/* Restore the user stack.  */\n\
-	mov %edx, %esp\n\
-\n\
-	/* Clear the SA_ONSTACK flag.  */\n\
-	and %ecx, %ecx\n\
-	jz after_clear\n\
-	lock; and $~1, 0(%ecx)\n\
-after_clear:\n\
-\n\
-	/* Restore eflags, the scratch regs and the original sp and ip.  */\n\
-	popl %eax\n\
-	popl %ecx\n\
-	popl %edx\n\
-	popf\n\
-	ret\n");
-
-extern char _signal_dispatch_entry_self;
-/* - 0(%esp) is the return address (we ignore it)
-   - 4(%esp) is the sp to load
-
-   Since we are returning to signal_dispatch_lowlevel's caller, we
-   also need to restore its frame pointer.  */
-__asm__ ("\n\
-	.globl _signal_dispatch_entry_self\n\
-_signal_dispatch_entry_self:\n\
-	mov 0(%ebp), %ebp\n\
-	mov 4(%esp), %esp\n\
-	jmp _signal_dispatch_entry\n");
-
-void
-signal_dispatch_lowlevel (struct signal_state *ss, pthread_t tid,
-			  siginfo_t si)
-{
-  assert (pthread_mutex_trylock (&ss->lock) == EBUSY);
-
-  struct __pthread *thread = __pthread_getid (tid);
-
-  bool self = tid == pthread_self ();
-
-  uintptr_t intr_sp;
-
-  if (self)
-    {
-      /* The return address is just before the first argument.  */
-      intr_sp = (uintptr_t) &ss - 4;
-      assert (* (void **) intr_sp == __builtin_return_address (0));
-    }
-  else
-    {
-      struct hurd_thread_exregs_in in;
-      memset (&in, 0, sizeof (in));
-      struct hurd_thread_exregs_out out;
-
-      error_t err;
-      err = rm_thread_exregs (ADDR_VOID, thread->object,
-			      HURD_EXREGS_STOP | HURD_EXREGS_ABORT_IPC
-			      | HURD_EXREGS_GET_REGS,
-			      in, &out);
-      if (err)
-	panic ("Failed to modify thread " ADDR_FMT,
-	       ADDR_PRINTF (thread->object));
-
-      intr_sp = out.sp;
-
-      /* Push the ip on the user stack.  */
-      intr_sp -= 4;
-      * (uintptr_t *) intr_sp = out.ip;
-    }
-
-  bool altstack = false;
-  uintptr_t sp;
-  if (! (ss->actions[si.si_signo - 1].sa_flags & SA_ONSTACK)
-      || (ss->stack.ss_flags & SS_DISABLE)
-      || (ss->stack.ss_flags & SS_ONSTACK))
-    {
-      assert (! self);
-      sp = intr_sp;
-    }
-  else
-    {
-      /* The stack grows down.  */
-      sp = (uintptr_t) ss->stack.ss_sp + ss->stack.ss_size;
-
-      /* We know intimately that SS_ONSTACK is the least significant
-	 bit.  */
-      assert (SS_ONSTACK == 1);
-      atomic_bit_set (&ss->stack.ss_flags, 0);
-
-      altstack = true;
-    }
-
-  /* Set up the call frame for a call to signal_dispatch_entry.  */
-
-  /* Allocate a siginfo structure on the stack.  */
-  sp = sp - sizeof (siginfo_t);
-  siginfo_t *sip = (void *) sp;
-  /* Copy the user supplied values.  */
-  *sip = si;
-
-  /* Add space for the 4 caller saved registers.  */
-  sp -= 4 * sizeof (uintptr_t);
-
-  /* Save the interrupted sp.  */
-  sp -= 4;
-  * (uintptr_t *) sp = intr_sp;
-
-  /* Address of the ss_flags.  */
-  sp -= 4;
-  if (altstack)
-    * (uintptr_t *) sp = (uintptr_t) &ss->stack.ss_flags;
-  else
-    * (uintptr_t *) sp = 0;
-
-  /* Push the parameters to signal_dispatch.  */
-
-  /* signal info structure.  */
-  sp -= 4;
-  * (uintptr_t *) sp = (uintptr_t) sip;
-
-  /* The ss.  */
-  sp -= 4;
-  * (uintptr_t *) sp = (uintptr_t) ss;
-
-  pthread_mutex_transfer_np (&ss->lock, tid);
-
-  if (self)
-    ((void (*) (uintptr_t)) &_signal_dispatch_entry_self) ((uintptr_t) sp);
-  else
-    {
-      struct hurd_thread_exregs_in in;
-      struct hurd_thread_exregs_out out;
-
-      in.sp = sp;
-      in.ip = (uintptr_t) &_signal_dispatch_entry;
-
-      rm_thread_exregs (ADDR_VOID, thread->object,
-			HURD_EXREGS_SET_SP_IP
-			| HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC,
-			in, &out);
-    }
-}
diff --git a/sysdeps/l4/hurd/powerpc/pt-machdep.c b/sysdeps/l4/hurd/powerpc/pt-machdep.c
deleted file mode 100644
index 754d203..0000000
--- a/sysdeps/l4/hurd/powerpc/pt-machdep.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Machine dependent pthreads code.  Hurd/PowerPC version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Nothing to do.  */
diff --git a/sysdeps/l4/hurd/powerpc/pt-setup.c b/sysdeps/l4/hurd/powerpc/pt-setup.c
deleted file mode 100644
index d3cf4ec..0000000
--- a/sysdeps/l4/hurd/powerpc/pt-setup.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Setup thread stack.  Hurd/PowerPC version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-
-#include <pt-internal.h>
-
-/* Arguments is passed in registers on the PowerPC.  But the
-   exchange registers syscall only allows us to set the PC and the
-   stack pointer so we put the entry point and start function on
-   the stack.  */
-struct start_info
-{
-  void (*entry_point) (void *(*)(void *), void *);
-  void *(*start_routine) (void *);
-  void *arg;
-};
-
-void first_entry_1 (void);
-
-/* Stage 1 entry function.  The start_info structure is inlined on the
-   stack.  Put values into registers and call entry function.  */
-asm ("				;\
-first_entry_1:			;\
-	lwz	0, 0(1)		;\
-	lwz	3, 4(1)		;\
-	lwz	4, 8(1)		;\
-	mtctr	0		;\
-	bctrl			;\
-");
-
-/* Set up the stack for THREAD, such that it appears as if
-   START_ROUTINE and ARG were passed to the new thread's entry-point.
-   Return the stack pointer for the new thread.  We also take the
-   opportunity to install THREAD in our utcb.  */
-static void *
-stack_setup (struct __pthread *thread,
-	     void (*entry_point)(void *(*)(void *), void *),
-	     void *(*start_routine)(void *), void *arg)
-{
-  l4_word_t *top;
-
-  /* Calculate top of the new stack.  */
-  top = (l4_word_t *) ((l4_word_t) thread->stackaddr + thread->stacksize);
-
-  /* Initial stack frame.  */
-  top[-4] = 0;
-  top = top - 4;
-
-  if (start_routine)
-    {
-      struct start_info *info = ((struct start_info *) top) - 1;
-
-      info->entry_point = entry_point;
-      info->start_routine = start_routine;
-      info->arg = arg;
-      return (void *) info;
-    }
-  return top;
-}
-
-int
-__pthread_setup (struct __pthread *thread,
-		 void (*entry_point)(void *(*)(void *), void *),
-		 void *(*start_routine)(void *), void *arg)
-{
-  thread->mcontext.pc = first_entry_1;
-  thread->mcontext.sp = stack_setup (thread, entry_point,
-				     start_routine, arg);
-
-  if (l4_same_threads (thread->threadid, l4_myself ()))
-    l4_set_user_defined_handle ((l4_word_t) thread);
-  else
-    l4_set_user_defined_handle_of (thread->threadid, 
-				   (l4_word_t) thread);
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/pt-block.c b/sysdeps/l4/hurd/pt-block.c
deleted file mode 100644
index 2315b1c..0000000
--- a/sysdeps/l4/hurd/pt-block.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Block a thread.  Viengoos version.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pt-internal.h>
-
-#include <hurd/stddef.h>
-#include <hurd/futex.h>
-
-/* Block THREAD.  */
-void
-__pthread_block (struct __pthread *thread)
-{
-  futex_wait (&thread->threadid, thread->threadid);
-}
diff --git a/sysdeps/l4/hurd/pt-kill.c b/sysdeps/l4/hurd/pt-kill.c
deleted file mode 100644
index c72e82f..0000000
--- a/sysdeps/l4/hurd/pt-kill.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* The generic version is good enough for us, however, the generic
-   Hurd on Mach version supplies a specialized version */
-#include "../generic/pt-kill.c"
diff --git a/sysdeps/l4/hurd/pt-setactivity-np.c b/sysdeps/l4/hurd/pt-setactivity-np.c
deleted file mode 100644
index f2f0723..0000000
--- a/sysdeps/l4/hurd/pt-setactivity-np.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Set a thread's activity activity.  Viengoos version.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pt-internal.h>
-
-#include <hurd/addr.h>
-#include <hurd/thread.h>
-
-int
-pthread_setactivity_np (addr_t activity)
-{
-  struct __pthread *self = _pthread_self ();
-
-  struct hurd_thread_exregs_in in;
-  in.activity = activity;
-
-  struct hurd_thread_exregs_out out;
-  int err = rm_thread_exregs (ADDR_VOID, self->object,
-			      HURD_EXREGS_SET_ACTIVITY,
-			      in, &out);
-
-  return err;
-}
diff --git a/sysdeps/l4/hurd/pt-sigstate-destroy.c b/sysdeps/l4/hurd/pt-sigstate-destroy.c
deleted file mode 100644
index 997a036..0000000
--- a/sysdeps/l4/hurd/pt-sigstate-destroy.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Destroy the signal state.  Hurd on L4 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-
-#include <pt-internal.h>
-
-void
-__pthread_sigstate_destroy (struct __pthread *thread)
-{
-  /* Nothing to do.  */
-}
diff --git a/sysdeps/l4/hurd/pt-sigstate-init.c b/sysdeps/l4/hurd/pt-sigstate-init.c
deleted file mode 100644
index 4c40fdb..0000000
--- a/sysdeps/l4/hurd/pt-sigstate-init.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Initialize the signal state.  Hurd on L4 version.
-   Copyright (C) 2003, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-
-#include <pt-internal.h>
-#include <sig-internal.h>
-
-error_t
-__pthread_sigstate_init (struct __pthread *thread)
-{
-  struct signal_state *ss = &thread->ss;
-
-  memset (ss, 0, sizeof (*ss));
-
-  ss->stack.ss_flags = SS_DISABLE;
-
-  int signo;
-  for (signo = 1; signo < NSIG; ++signo)
-    {
-      sigemptyset (&ss->actions[signo - 1].sa_mask);
-      ss->actions[signo - 1].sa_flags = SA_RESTART;
-      ss->actions[signo - 1].sa_handler = SIG_DFL;
-      ss->lock = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
-    }
-
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/pt-sigstate.c b/sysdeps/l4/hurd/pt-sigstate.c
deleted file mode 100644
index 66dd08c..0000000
--- a/sysdeps/l4/hurd/pt-sigstate.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Set a thread's signal state.  Hurd on L4 version.
-   Copyright (C) 2002, 2005, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-#include <assert.h>
-#include <signal.h>
-
-#include <pt-internal.h>
-
-error_t
-__pthread_sigstate (struct __pthread *thread, int how,
-		    const sigset_t *set, sigset_t *oset,
-		    int clear_pending)
-{
-  struct signal_state *ss = &thread->ss;
-  pthread_mutex_lock (&ss->lock);
-
-  if (oset)
-    *oset = ss->blocked;
-
-  if (set)
-    {
-      /* Mask out SIGKILL and SIGSTOP.  */
-      sigset_t s = *set;
-      sigdelset (&s, SIGKILL);
-      sigdelset (&s, SIGSTOP);
-
-      switch (how)
-	{
-	case SIG_BLOCK:
-	  ss->blocked |= s;
-	  break;
-	case SIG_UNBLOCK:
-	  ss->blocked &= ~s;
-	  break;
-	case SIG_SETMASK:
-	  ss->blocked = s;
-	  break;
-	default:
-	  errno = EINVAL;
-	  pthread_mutex_unlock (&ss->lock);
-	  return -1;
-	}
-    }
-
-  if (clear_pending)
-    sigemptyset (&ss->pending);
-
-  /* A "signal shall remain pending until it is unblocked" (2.4.1).
-
-     "If there are any pending unblocked signals after the call to
-     sigprocmask(), at least one of those signals shall be delivered
-     before the call to sigprocmask() returns."
-     (pthread_sigmask).  */
-  sigset_t extant = ~ss->blocked & ss->pending;
-  if (! extant)
-    extant = ~ss->blocked & process_pending;
-
-  pthread_mutex_unlock (&ss->lock);
-
-  if (extant)
-    raise (l4_lsb64 (extant));
-
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/pt-startup.c b/sysdeps/l4/hurd/pt-startup.c
deleted file mode 100644
index b6461de..0000000
--- a/sysdeps/l4/hurd/pt-startup.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Thread initialization.  Hurd/L4 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-#include <pt-internal.h>
-
-#include <hurd/exceptions.h>
-
-void
-__pthread_startup (void)
-{
-  struct __pthread *pthread = _pthread_self ();
-  pthread->threadid = l4_myself ();
-}
diff --git a/sysdeps/l4/hurd/pt-sysdep.c b/sysdeps/l4/hurd/pt-sysdep.c
deleted file mode 100644
index c23364c..0000000
--- a/sysdeps/l4/hurd/pt-sysdep.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* System dependent pthreads code.  Hurd version.
-   Copyright (C) 2000, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include <pt-internal.h>
-
-int
-sched_yield (void)
-{
-  l4_yield ();
-  return 0;
-}
-
-/* Forward.  */
-static void init_routine (void (*) (void *), void *)
-  __attribute__ ((noreturn));
-
-/* OK, the name of this variable isn't really appropriate, but I don't
-   want to change it yet.  */
-void (*_pthread_init_routine)(void (*) (void *), void *) = &init_routine;
-
-/* This function is called from the Hurd-specific startup code.  It
-   should return a new stack pointer for the main thread.  The caller
-   will switch to this new stack before doing anything serious.  */
-static void
-init_routine (void (*entry) (void *), void *arg)
-{
-  /* Initialize the library.  */
-  __pthread_initialize ();
-
-  struct __pthread *thread;
-  int err;
-
-  /* Create the pthread structure for the main thread (i.e. us).  */
-  err = __pthread_create_internal (&thread, 0,
-				   (void *(*)(void *)) entry, arg);
-  assert_perror (err);
-
-  /* Switch stacks.  */
-  l4_start_sp_ip (l4_myself (), thread->mcontext.sp,
-		  thread->mcontext.pc);
-}
diff --git a/sysdeps/l4/hurd/pt-sysdep.h b/sysdeps/l4/hurd/pt-sysdep.h
deleted file mode 100644
index 08bcd14..0000000
--- a/sysdeps/l4/hurd/pt-sysdep.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Internal definitions for pthreads library.
-   Copyright (C) 2000, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _PT_SYSDEP_H
-#define _PT_SYSDEP_H	1
-
-#include <l4.h>
-#include <hurd/storage.h>
-#include <sys/mman.h>
-
-/* XXX */
-#define _POSIX_THREAD_THREADS_MAX	64
-
-/* The default stack size: 2MB.  */
-#define PTHREAD_STACK_DEFAULT	(2 * 1024 * 1024)
-
-#include <hurd/exceptions.h>
-
-#define EXCEPTION_AREA_SIZE EXCEPTION_STACK_SIZE
-#define EXCEPTION_AREA_SIZE_LOG2 EXCEPTION_STACK_SIZE_LOG2
-/* The exception page is the first object.  */
-#define EXCEPTION_PAGE 0
-
-#define PTHREAD_SYSDEP_MEMBERS \
-  addr_t object; \
-  l4_thread_id_t threadid; \
-  addr_t exception_area[EXCEPTION_AREA_SIZE / PAGESIZE]; \
-  void *exception_area_va; \
-  l4_word_t my_errno;
-
-extern inline struct __pthread *
-__attribute__((__always_inline__))
-_pthread_self (void)
-{
-  return (struct __pthread *) l4_user_defined_handle ();
-}
-
-extern inline void
-__attribute__((__always_inline__))
-__pthread_stack_dealloc (void *stackaddr, size_t stacksize)
-{
-  munmap (stackaddr, stacksize);
-}
-
-#endif /* pt-sysdep.h */
diff --git a/sysdeps/l4/hurd/pt-thread-alloc.c b/sysdeps/l4/hurd/pt-thread-alloc.c
deleted file mode 100644
index ada7b3b..0000000
--- a/sysdeps/l4/hurd/pt-thread-alloc.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Allocate kernel thread.  Viengoos version.
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
-#include <hurd/startup.h>
-#include <hurd/storage.h>
-#include <hurd/as.h>
-#include <hurd/addr.h>
-
-#include <pt-internal.h>
-
-extern struct hurd_startup_data *__hurd_startup_data;
-
-extern addr_t meta_data_activity;
-
-int
-__pthread_thread_alloc (struct __pthread *thread)
-{
-  /* The main thread is already running of course.  */
-  if (__pthread_num_threads == 1)
-    {
-      thread->object = __hurd_startup_data->thread;
-      thread->threadid = l4_myself ();
-      return 0;
-    }
-  else
-    {
-      addr_t exception_area = as_alloc (EXCEPTION_AREA_SIZE_LOG2, 1, true);
-
-      thread->exception_area_va
-	= ADDR_TO_PTR (addr_extend (exception_area,
-				    0, EXCEPTION_AREA_SIZE_LOG2));
-
-      int i;
-      for (i = 0; i < EXCEPTION_AREA_SIZE / PAGESIZE; i ++)
-	{
-	  addr_t slot = addr_chop (PTR_TO_ADDR (thread->exception_area_va
-						+ i * PAGESIZE),
-				   PAGESIZE_LOG2);
-	  as_ensure (slot);
-
-	  struct storage storage = storage_alloc (ADDR_VOID, cap_page,
-						  STORAGE_LONG_LIVED,
-						  OBJECT_POLICY_DEFAULT,
-						  slot);
-	  if (ADDR_IS_VOID (storage.addr))
-	    {
-	      int j;
-	      for (j = 0; j < i; j ++)
-		storage_free (thread->exception_area[j], false);
-	      as_free (exception_area, false);
-	      return EAGAIN;
-	    }
-
-	  thread->exception_area[i] = storage.addr;
-	}
-
-      struct storage storage;
-      storage = storage_alloc (meta_data_activity, cap_thread,
-			       /* Threads are rarely shortly lived.  */
-			       STORAGE_MEDIUM_LIVED, OBJECT_POLICY_DEFAULT,
-			       ADDR_VOID);
-      if (ADDR_IS_VOID (storage.addr))
-	{
-	  int j;
-	  for (j = 0; j < EXCEPTION_AREA_SIZE / PAGESIZE; j ++)
-	    storage_free (thread->exception_area[j], false);
-	  as_free (exception_area, false);
-	  return EAGAIN;
-	}
-
-      thread->object = storage.addr;
-    }
-
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/pt-thread-halt.c b/sysdeps/l4/hurd/pt-thread-halt.c
deleted file mode 100644
index 98fefaa..0000000
--- a/sysdeps/l4/hurd/pt-thread-halt.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Deallocate the kernel thread resources.  Viengoos version.
-   Copyright (C) 2007, 2008 Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-#include <hurd/exceptions.h>
-#include <hurd/mutex.h>
-#include <hurd/as.h>
-#include <hurd/addr.h>
-
-/* If we try to deallocate our self, we will end up causing a
-   deadlock.  Thus, when a thread tries to free itself, we add it
-   here.  The next thread to free a thread will free it.  */
-ss_mutex_t saved_object_lock;
-static addr_t saved_object;
-
-void
-__pthread_thread_halt (struct __pthread *thread, int need_dealloc)
-{
-  /* We may deallocate THREAD.  First save any data we need.  */
-
-  addr_t exception_area[EXCEPTION_AREA_SIZE / PAGESIZE];
-  memcpy (exception_area, thread->exception_area,
-	  sizeof (thread->exception_area));
-  memset (thread->exception_area, 0, sizeof (thread->exception_area));
-
-  void *va = thread->exception_area_va;
-
-  addr_t object = thread->object;
-  l4_thread_id_t tid = thread->threadid;
-
-  if (need_dealloc)
-    __pthread_dealloc (thread);
-
-  /* The THREAD data structure is no longer valid.  */
-  thread = NULL;
-
-  /* Deallocate any saved object.  */
-  ss_mutex_lock (&saved_object_lock);
-  if (! ADDR_IS_VOID (saved_object))
-    {
-      storage_free (saved_object, false);
-      saved_object = ADDR_VOID;
-    }
-  ss_mutex_unlock (&saved_object_lock);
-
-  /* Free the exception area.  */
-
-  /* Clean up the exception page.  */
-  exception_page_cleanup
-    (ADDR_TO_PTR (addr_extend (exception_area[EXCEPTION_PAGE],
-			       0, PAGESIZE_LOG2)));
-
-  /* Free the storage.  */
-  int i;
-  for (i = 0; i < EXCEPTION_AREA_SIZE / PAGESIZE; i ++)
-    {
-      assert (! ADDR_IS_VOID (exception_area[i]));
-      storage_free (exception_area[i], false);
-    }
-
-  /* And the address space.  */
-  as_free (addr_chop (PTR_TO_ADDR (va), EXCEPTION_AREA_SIZE_LOG2), false);
-
-  if (tid == l4_myself ())
-    /* If we try to storage_free (storage.addr), we will freeze in the
-       middle.  That's no good.  We set SAVED_OBJECT to our thread
-       object and the next thread in will free us.  */
-    {
-      ss_mutex_lock (&saved_object_lock);
-      saved_object = object;
-      ss_mutex_unlock (&saved_object_lock);
-    }
-  else
-    storage_free (object, false);
-
-  if (tid == l4_myself ())
-    {
-      l4_send_timeout (l4_myself (), L4_NEVER);
-      panic ("Failed to stop thread %x.%x!",
-	     l4_thread_no (l4_myself ()), l4_version (l4_myself ()));
-    }
-  else
-    thread_stop (object);
-}
diff --git a/sysdeps/l4/hurd/pt-thread-start.c b/sysdeps/l4/hurd/pt-thread-start.c
deleted file mode 100644
index 9db399c..0000000
--- a/sysdeps/l4/hurd/pt-thread-start.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Start thread.  L4 version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <hurd/thread.h>
-#include <hurd/exceptions.h>
-
-#include <pt-internal.h>
-
-int
-__pthread_thread_start (struct __pthread *thread)
-{
-  error_t err;
-
-  if (__pthread_num_threads == 1)
-    /* The main thread is already running of course.  */
-    {
-      assert (__pthread_total == 1);
-      assert (l4_is_thread_equal (l4_myself (), thread->threadid));
-      l4_set_user_defined_handle ((l4_word_t) thread);
-    }
-  else
-    {
-      struct hurd_thread_exregs_in in;
-      struct hurd_thread_exregs_out out;
-
-      in.aspace = ADDR (0, 0);
-      in.aspace_cap_properties = CAP_PROPERTIES_VOID;
-      in.aspace_cap_properties_flags = CAP_COPY_COPY_SOURCE_GUARD;
-
-      in.activity = ADDR_VOID;
-
-      in.exception_page = addr_chop (PTR_TO_ADDR (thread->exception_area_va),
-				     PAGESIZE_LOG2);
-
-      in.sp = (l4_word_t) thread->mcontext.sp;
-      in.ip = (l4_word_t) thread->mcontext.pc;
-
-      in.user_handle = (l4_word_t) thread;
-      err = rm_thread_exregs (ADDR_VOID, thread->object,
-			      HURD_EXREGS_SET_ASPACE
-			      | HURD_EXREGS_SET_ACTIVITY
-			      | HURD_EXREGS_SET_EXCEPTION_PAGE
-			      | HURD_EXREGS_SET_SP_IP
-			      | HURD_EXREGS_SET_USER_HANDLE
-			      | HURD_EXREGS_START
-			      | HURD_EXREGS_ABORT_IPC,
-			      in, &out);
-      assert (err == 0);
-    }
-  return 0;
-}
diff --git a/sysdeps/l4/hurd/pt-wakeup.c b/sysdeps/l4/hurd/pt-wakeup.c
deleted file mode 100644
index e568a6f..0000000
--- a/sysdeps/l4/hurd/pt-wakeup.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Wakeup a thread.  Viengoos version.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pt-internal.h>
-
-#include <hurd/stddef.h>
-#include <hurd/futex.h>
-#include <stdint.h>
-
-/* Wakeup THREAD.  */
-void
-__pthread_wakeup (struct __pthread *thread)
-{
-  /* We need to loop here as the blocked thread may not yet be
-     blocked!  Here's what happens when a thread blocks: it registers
-     itself as blocked, drops the relevant lock and then actually
-     blocks (via __pthread_block).  This means that after dropping the
-     lock and before blocking, it may be interrupted and another
-     thread may try to wake it.  */
-  long ret;
-  do
-    {
-      ret = futex_wake (&thread->threadid, INT_MAX);
-      assertx (ret <= 1, "tid: %x, ret: %d", thread->threadid, ret);
-
-      if (ret == 0)
-	l4_thread_switch (thread->threadid);
-    }
-  while (ret == 0);
-}
diff --git a/sysdeps/l4/hurd/sig-sysdep.h b/sysdeps/l4/hurd/sig-sysdep.h
deleted file mode 100644
index 33e1385..0000000
--- a/sysdeps/l4/hurd/sig-sysdep.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* sig-sysdep.h - Hurd system specific header file.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Neal H. Walfield <neal@gnu.org>.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 3 of
-   the License, or (at your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <l4.h>
-#include <string.h>
-
-struct utcb
-{
-  l4_word_t saved_sender;
-  l4_word_t saved_receiver;
-  l4_word_t saved_timeout;
-  l4_word_t saved_error_code;
-  l4_word_t saved_flags;
-  l4_word_t saved_br0;
-  l4_msg_t saved_message;
-};
-
-static inline void
-utcb_state_save (struct utcb *buffer)
-{
-  l4_word_t *utcb = _L4_utcb ();
-
-  buffer->saved_sender = utcb[_L4_UTCB_SENDER];
-  buffer->saved_receiver = utcb[_L4_UTCB_RECEIVER];
-  buffer->saved_timeout = utcb[_L4_UTCB_TIMEOUT];
-  buffer->saved_error_code = utcb[_L4_UTCB_ERROR_CODE];
-  buffer->saved_flags = utcb[_L4_UTCB_FLAGS];
-  buffer->saved_br0 = utcb[_L4_UTCB_BR0];
-  memcpy (&buffer->saved_message,
-	  utcb, L4_NUM_MRS * sizeof (l4_word_t));
-}
-
-static inline void
-utcb_state_restore (struct utcb *buffer)
-{
-  l4_word_t *utcb = _L4_utcb ();
-
-  utcb[_L4_UTCB_SENDER] = buffer->saved_sender;
-  utcb[_L4_UTCB_RECEIVER] = buffer->saved_receiver;
-  utcb[_L4_UTCB_TIMEOUT] = buffer->saved_timeout;
-  utcb[_L4_UTCB_ERROR_CODE] = buffer->saved_error_code;
-  utcb[_L4_UTCB_FLAGS] = buffer->saved_flags;
-  utcb[_L4_UTCB_BR0] = buffer->saved_br0;
-  memcpy (utcb, &buffer->saved_message,
-	  L4_NUM_MRS * sizeof (l4_word_t));
-}
-
-#define SIGNAL_DISPATCH_ENTRY \
-  struct utcb buffer; utcb_state_save (&buffer);
-
-#define SIGNAL_DISPATCH_EXIT \
-  utcb_state_restore (&buffer);
diff --git a/sysdeps/l4/hurd/sigprocmask.c b/sysdeps/l4/hurd/sigprocmask.c
deleted file mode 100644
index a38b379..0000000
--- a/sysdeps/l4/hurd/sigprocmask.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* sigprocmask.c - Generic sigprocmask implementation.
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Neal H. Walfield <neal@gnu.org>.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 3 of
-   the License, or (at your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pt-internal.h>
-#include <sig-internal.h>
-
-int
-sigprocmask (int how, const sigset_t *restrict set, sigset_t *restrict old)
-{
-  struct __pthread *thread = _pthread_self ();
-  if (! thread)
-    /* Library is initializing.  */
-    {
-      assert (__pthread_num_threads == 1);
-
-      /* We should get the default mask from the startup data structure.  */
-      if (old)
-	*old = 0;
-
-      return 0;
-    }
-
-  return pthread_sigmask (how, set, old);
-}
diff --git a/sysdeps/l4/pt-block.c b/sysdeps/l4/pt-block.c
deleted file mode 100644
index 69e1d35..0000000
--- a/sysdeps/l4/pt-block.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Block a thread.  L4 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-
-#include <pt-internal.h>
-
-#include <hurd/stddef.h>
-
-/* Block THREAD.  */
-void
-__pthread_block (struct __pthread *thread)
-{
-  debug (5, "%x.%x/%x blocking",
-	 l4_thread_no (thread->threadid), l4_version (thread->threadid),
-	 thread->threadid);
-
-  l4_accept (L4_UNTYPED_WORDS_ACCEPTOR);
-  l4_msg_tag_t tag = l4_receive (l4_anythread);
-  if (l4_ipc_failed (tag))
-    {
-      debug (1, "%x.%x failed to block: %d, offset: %x",
-	     l4_thread_no (l4_myself ()), l4_version (l4_myself ()),
-	     (l4_error_code () >> 1) & 0x7,
-	     l4_error_code () >> 4);
-      assert (! l4_ipc_failed (tag));
-    }
-  else
-    debug (5, "%x.%x unblocked",
-	   l4_thread_no (thread->threadid), l4_version (thread->threadid));
-}
diff --git a/sysdeps/l4/pt-docancel.c b/sysdeps/l4/pt-docancel.c
deleted file mode 100644
index a3965d0..0000000
--- a/sysdeps/l4/pt-docancel.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Cancel a thread.
-   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-
-#include <pt-internal.h>
-
-static void
-call_exit (void)
-{
-  pthread_exit (0);
-}
-
-int
-__pthread_do_cancel (struct __pthread *p)
-{
-  assert (p->cancel_pending == 1);
-  assert (p->cancel_state == PTHREAD_CANCEL_ENABLE);
-
-  if (l4_is_thread_equal (l4_myself (), p->threadid))
-    call_exit ();
-  else
-    l4_start_sp_ip (p->threadid, (l4_word_t) p->mcontext.sp,
-		    (l4_word_t) call_exit);
-  return 0;
-}
diff --git a/sysdeps/l4/pt-pool-np.c b/sysdeps/l4/pt-pool-np.c
deleted file mode 100644
index e83022b..0000000
--- a/sysdeps/l4/pt-pool-np.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Thread pool for L4 threads.
-   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pt-internal.h>
-#include <l4/thread.h>
-
-static pthread_mutex_t pool_lock = PTHREAD_MUTEX_INITIALIZER;
-
-_L4_thread_id_t pool_list = l4_nilthread;
-
-/* Add the thread TID to the pthread kernel thread pool.  */
-int
-pthread_pool_add_np (l4_thread_id_t tid)
-{
-  __pthread_mutex_lock (&pool_lock);
-  /* FIXME: Do error checking.  */
-  l4_set_user_defined_handle_of (tid, pool_list);
-  pool_list = tid;
-  __pthread_mutex_unlock (&pool_lock);
-
-  return 0;
-}
-
-
-/* Get the first thread from the pool.  */
-l4_thread_id_t
-pthread_pool_get_np (void)
-{
-  _L4_thread_id_t tid;
-
-  __pthread_mutex_lock (&pool_lock);
-  /* FIXME: Do error checking.  */
-  tid = pool_list;
-  if (tid != l4_nilthread)
-    pool_list = l4_user_defined_handle_of (tid);
-  __pthread_mutex_unlock (&pool_lock);
-  return tid;
-}
diff --git a/sysdeps/l4/pt-spin.c b/sysdeps/l4/pt-spin.c
deleted file mode 100644
index b6978b0..0000000
--- a/sysdeps/l4/pt-spin.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Spin locks.  L4 version.
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-
-#include <pthread.h>
-#include <sched.h>
-
-/* The default for single processor machines; don't spin, it's
-   pointless.  */
-#ifndef __PTHREAD_SPIN_COUNT
-# define __PTHREAD_SPIN_COUNT 1
-#endif
-
-/* The number of times to spin while trying to lock a spin lock object
-   before yielding the processor. */
-int __pthread_spin_count = __PTHREAD_SPIN_COUNT;
-
-
-/* Lock the spin lock object LOCK.  If the lock is held by another
-   thread spin until it becomes available.  */
-int
-_pthread_spin_lock (__pthread_spinlock_t *lock)
-{
-  l4_time_t timeout;
-  int i;
-
-  /* Start with a small timeout of 2 microseconds, then back off
-     exponentially.  */
-  timeout = l4_time_period (2);
-
-  while (1)
-    {
-      for (i = 0; i < __pthread_spin_count; i++)
-	{
-	  if (__pthread_spin_trylock (lock) == 0)
-	    return 0;
-	}
-      l4_sleep (timeout);
-
-      timeout = l4_time_mul2 (timeout);
-      if (timeout == L4_NEVER)
-	timeout = L4_TIME_PERIOD_MAX;
-    }
-}
-
-weak_alias (_pthread_spin_lock, pthread_spin_lock);
diff --git a/sysdeps/l4/pt-stack-alloc.c b/sysdeps/l4/pt-stack-alloc.c
deleted file mode 100644
index b7ec12b..0000000
--- a/sysdeps/l4/pt-stack-alloc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Allocate a new stack.  L4 Hurd version.
-   Copyright (C) 2000, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-#include <sys/mman.h>
-
-/* Allocate a new stack of size STACKSIZE.  If successful, store the
-   address of the newly allocated stack in *STACKADDR and return 0.
-   Otherwise return an error code (EINVAL for an invalid stack size,
-   EAGAIN if the system lacked the necessary resources to allocate a
-   new stack).  */
-int
-__pthread_stack_alloc (void **stackaddr, size_t stacksize)
-{
-  void *buffer = mmap (0, stacksize, PROT_READ | PROT_WRITE,
-		       MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-  if (buffer == MAP_FAILED)
-    return EAGAIN;
-
-  *stackaddr = buffer;
-
-  return 0;
-}
diff --git a/sysdeps/l4/pt-thread-alloc.c b/sysdeps/l4/pt-thread-alloc.c
deleted file mode 100644
index ec69afb..0000000
--- a/sysdeps/l4/pt-thread-alloc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Allocate kernel thread.  L4 version.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
-#include <pt-internal.h>
-
-int
-__pthread_thread_alloc (struct __pthread *thread)
-{
-  error_t err;
-
-  /* The main thread is already running of course.  */
-  if (__pthread_num_threads == 1)
-    thread->threadid = l4_myself ();
-  else
-    {
-      thread->threadid = pthread_pool_get_np ();
-      if (thread->threadid != l4_nilthread)
-	return 0;
-
-      return EAGAIN;
-    }
-  return 0;
-}
diff --git a/sysdeps/l4/pt-thread-dealloc.c b/sysdeps/l4/pt-thread-dealloc.c
deleted file mode 100644
index c09e486..0000000
--- a/sysdeps/l4/pt-thread-dealloc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Deallocate the kernel thread resources.  L4 version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <l4.h>
-
-#include <pt-internal.h>
-
-/* Deallocate any kernel resources associated with THREAD except don't
-   halt the thread itself.  On return, the thread will be marked as
-   dead and __pthread_halt will be called.  */
-void
-__pthread_thread_dealloc (struct __pthread *thread)
-{
-}
diff --git a/sysdeps/l4/pt-thread-halt.c b/sysdeps/l4/pt-thread-halt.c
deleted file mode 100644
index aa2bf43..0000000
--- a/sysdeps/l4/pt-thread-halt.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Deallocate the kernel thread resources.  L4version.
-   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-/* Deallocate the kernel thread resources associated with THREAD.  */
-void
-__pthread_thread_halt (struct __pthread *thread, int need_dealloc)
-{
-  l4_thread_id_t tid = thread->threadid;
-
-  if (need_dealloc)
-    __pthread_dealloc (thread);
-
-  /* There is potential race here: once if TID is the current thread,
-     then once we add TID to the pool, someone can reallocate it
-     before we call stop.  However, to start the thread, the caller
-     atomically starts and sets the sp and ip, thus, if the stop has
-     not yet executed at that point, it won't.  */
-
-  if (tid != l4_myself ())
-    l4_stop (tid);
-  pthread_pool_add_np (tid);
-  if (tid == l4_myself ())
-    l4_stop (tid);
-}
diff --git a/sysdeps/l4/pt-thread-start.c b/sysdeps/l4/pt-thread-start.c
deleted file mode 100644
index 144c58b..0000000
--- a/sysdeps/l4/pt-thread-start.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Start thread.  L4 version.
-   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
-#include <pt-internal.h>
-
-/* Start THREAD.  Get the kernel thread scheduled and running.  */
-int
-__pthread_thread_start (struct __pthread *thread)
-{
-  if (__pthread_num_threads == 1)
-    /* The main thread is already running of course.  */
-    {
-      assert (__pthread_total == 1);
-      assert (l4_is_thread_equal (l4_myself (), thread->threadid));
-    }
-  else
-    l4_start_sp_ip (thread->threadid, (l4_word_t) thread->mcontext.sp,
-		    (l4_word_t) thread->mcontext.pc);
-  return 0;
-}
diff --git a/sysdeps/l4/pt-timedblock.c b/sysdeps/l4/pt-timedblock.c
deleted file mode 100644
index ce7972b..0000000
--- a/sysdeps/l4/pt-timedblock.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Block a thread with a timeout.  L4 version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <time.h>
-#include <sys/time.h>
-
-#include <pt-internal.h>
-
-/* Block THREAD.  */
-error_t
-__pthread_timedblock (struct __pthread *thread,
-		      const struct timespec *abstime)
-{
-#warning Need gettimeofday to implement properly.
-  __pthread_block (thread);
-  return 0;
-}
diff --git a/sysdeps/l4/pt-wakeup.c b/sysdeps/l4/pt-wakeup.c
deleted file mode 100644
index de37846..0000000
--- a/sysdeps/l4/pt-wakeup.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Wakeup a thread.  L4 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <l4.h>
-
-#include <pt-internal.h>
-
-#include <hurd/stddef.h>
-
-/* Wakeup THREAD.  */
-void
-__pthread_wakeup (struct __pthread *thread)
-{
-  debug (5, "%x.%x/%x waking %x.%x/%x",
-	 l4_thread_no (l4_myself ()), l4_version (l4_myself ()), l4_myself (),
-	 l4_thread_no (thread->threadid), l4_version (thread->threadid),
-	 thread->threadid);
-
-  /* Signal the waiter.  */
-  l4_msg_t msg;
-  l4_msg_clear (msg);
-  l4_msg_set_untyped_words (msg, 0);
-  l4_msg_load (msg);
-
-  l4_msg_tag_t tag = l4_send (thread->threadid);
-  if (l4_ipc_failed (tag))
-    {
-      int err = l4_error_code ();
-      debug (1, "%x.%x failed to wake %x.%x: %s (%d)",
-	     l4_thread_no (l4_myself ()), l4_version (l4_myself ()),
-	     l4_thread_no (thread->threadid), l4_version (thread->threadid),
-	     l4_strerror (err), err);
-    }
-  else
-    debug (5, "%x.%x woke %x.%x",
-	   l4_thread_no (l4_myself ()), l4_version (l4_myself ()),
-	   l4_thread_no (thread->threadid), l4_version (thread->threadid));
-}
diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies
new file mode 100644
index 0000000..16b8348
--- /dev/null
+++ b/sysdeps/mach/hurd/Implies
@@ -0,0 +1 @@
+hurd
diff --git a/sysdeps/mach/hurd/ia32/pt-machdep.c b/sysdeps/mach/hurd/i386/pt-machdep.c
index f3c8cf5..f3c8cf5 100644
--- a/sysdeps/mach/hurd/ia32/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/pt-machdep.c
diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/i386/pt-setup.c
index 5420dc8..73fd43d 100644
--- a/sysdeps/mach/hurd/ia32/pt-setup.c
+++ b/sysdeps/mach/hurd/i386/pt-setup.c
@@ -57,16 +57,14 @@ stack_setup (struct __pthread *thread,
   /* Next, make room for the TSDs.  */
   top -= __hurd_threadvar_max;
 
-  /* Save the self pointer.  */
-  top[_HURD_THREADVAR_THREAD] = (uintptr_t) thread;
-
   if (start_routine)
     {
       /* And then the call frame.  */
-      top -= 2;
+      top -= 3;
       top = (uintptr_t *) ((uintptr_t) top & ~0xf);
-      top[1] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
-      top[0] = (uintptr_t) start_routine;
+      top[2] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
+      top[1] = (uintptr_t) start_routine;
+      top[0] = (uintptr_t) thread;
       *--top = 0;		/* Fake return address.  */
     }
 
@@ -82,7 +80,7 @@ stack_setup (struct __pthread *thread,
 
 int
 __pthread_setup (struct __pthread *thread,
-		 void (*entry_point)(void *(*)(void *), void *),
+		 void (*entry_point)(struct __pthread *, void *(*)(void *), void *),
 		 void *(*start_routine)(void *), void *arg)
 {
   error_t err;
diff --git a/sysdeps/mach/hurd/pt-sysdep.c b/sysdeps/mach/hurd/pt-sysdep.c
index 5e07006..f40fee5 100644
--- a/sysdeps/mach/hurd/pt-sysdep.c
+++ b/sysdeps/mach/hurd/pt-sysdep.c
@@ -28,6 +28,8 @@
 
 #include <pt-internal.h>
 
+__thread struct __pthread *___pthread_self;
+
 /* Forward.  */
 static void *init_routine (void);
 
@@ -45,14 +47,13 @@ init_routine (void)
   int err;
 
   /* Initialize the library.  */
-  __pthread_initialize ();
+  __pthread_init ();
 
   /* Create the pthread structure for the main thread (i.e. us).  */
   err = __pthread_create_internal (&thread, 0, 0, 0);
   assert_perror (err);
 
-  ((void **) (__hurd_threadvar_stack_offset))[_HURD_THREADVAR_THREAD]
-    = thread;
+  ___pthread_self = thread;
 
   /* Decrease the number of threads, to take into account that the
      signal thread (which will be created by the glibc startup code
diff --git a/sysdeps/mach/hurd/pt-sysdep.h b/sysdeps/mach/hurd/pt-sysdep.h
index 13e235d..bec1b40 100644
--- a/sysdeps/mach/hurd/pt-sysdep.h
+++ b/sysdeps/mach/hurd/pt-sysdep.h
@@ -35,15 +35,13 @@
   mach_msg_header_t wakeupmsg; \
   int have_kernel_resources;
 
-#define _HURD_THREADVAR_THREAD _HURD_THREADVAR_DYNAMIC_USER
-
+extern __thread struct __pthread *___pthread_self;
 #define _pthread_self()                                            \
 	({                                                         \
 	  struct __pthread *thread;                                \
 	                                                           \
 	  assert (__pthread_threads);                              \
-	  thread = *(struct __pthread **)                          \
-	    __hurd_threadvar_location (_HURD_THREADVAR_THREAD);    \
+	  thread = ___pthread_self;                                \
 	                                                           \
 	  assert (thread);                                         \
 	  assert (({ mach_port_t ktid = __mach_thread_self ();     \
diff --git a/sysdeps/mach/pt-timedblock.c b/sysdeps/mach/pt-timedblock.c
index 6f54726..d72ef73 100644
--- a/sysdeps/mach/pt-timedblock.c
+++ b/sysdeps/mach/pt-timedblock.c
@@ -30,32 +30,32 @@
 /* Block THREAD.  */
 error_t
 __pthread_timedblock (struct __pthread *thread,
-		      const struct timespec *abstime)
+		      const struct timespec *abstime,
+		      clockid_t clock_id)
 {
   error_t err;
   mach_msg_header_t msg;
   mach_msg_timeout_t timeout;
-  struct timeval now;
+  struct timespec now;
 
   /* We have an absolute time and now we have to convert it to a
      relative time.  Arg.  */
 
-  err = gettimeofday(&now, NULL);
+  err = clock_gettime (clock_id, &now);
   assert (! err);
 
   if (now.tv_sec > abstime->tv_sec
       || (now.tv_sec == abstime->tv_sec
-	  && now.tv_usec > ((abstime->tv_nsec + 999) / 1000)))
+	  && now.tv_nsec > abstime->tv_nsec))
     return ETIMEDOUT;
 
   timeout = (abstime->tv_sec - now.tv_sec) * 1000;
 
-  if (((abstime->tv_nsec + 999) / 1000) >= now.tv_usec)
-    timeout += (((abstime->tv_nsec + 999) / 1000) - now.tv_usec + 999) / 1000;
+  if (abstime->tv_nsec >= now.tv_nsec)
+    timeout += (abstime->tv_nsec - now.tv_nsec + 999999) / 1000000;
   else
     /* Need to do a carry.  */
-    timeout -= (now.tv_usec + 999) / 1000 -
-      ((abstime->tv_nsec + 999999) / 1000000);
+    timeout -= (now.tv_nsec - abstime->tv_nsec + 999999) / 1000000;
 
   err = __mach_msg (&msg, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0,
 		    sizeof msg, thread->wakeupmsg.msgh_remote_port,
diff --git a/sysdeps/powerpc/bits/machine-lock.h b/sysdeps/powerpc/bits/machine-lock.h
deleted file mode 100644
index cba6b0a..0000000
--- a/sysdeps/powerpc/bits/machine-lock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Machine-specific definition for spin locks.  PowerPC version.
-   Copyright (C) 1994,97,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _MACHINE_LOCK_H
-#define	_MACHINE_LOCK_H
-
-/* The type of a spin lock variable.  */
-
-typedef __volatile long int __spin_lock_t;
-
-/* Value to initialize `__spin_lock_t' variables to.  */
-
-#define	__SPIN_LOCK_INITIALIZER	0L
-
-
-#ifndef _EXTERN_INLINE
-#define _EXTERN_INLINE extern __inline
-#endif
-
-/* Unlock LOCK.  */
-
-_EXTERN_INLINE void
-__spin_unlock (__spin_lock_t *__lock)
-{
-  long int __locked;
-  __asm__ __volatile__ ("\
-0:	lwarx	%0,0,%1\n\
-	stwcx.	%2,0,%1\n\
-	bne-	0b\n\
-" : "=&r" (__locked) : "r" (__lock), "r" (0) : "cr0");
-}
-
-/* Try to lock LOCK; return nonzero if we locked it, zero if another has.  */
-
-_EXTERN_INLINE int
-__spin_try_lock (register __spin_lock_t *__lock)
-{
-  long int __rtn;
-  __asm__ __volatile__ ("\
-0:	lwarx	%0,0,%1\n\
-	stwcx.	%2,0,%1\n\
-	bne-	0b\n\
-" : "=&r" (__rtn) : "r" (__lock), "r" (1) : "cr0");
-  return !__rtn;
-}
-
-/* Return nonzero if LOCK is locked.  */
-
-_EXTERN_INLINE int
-__spin_lock_locked (__spin_lock_t *__lock)
-{
-  long int __rtn;
-  __asm__ __volatile__ ("\
-0:	lwarx	%0,0,%1\n\
-	stwcx.	%0,0,%1\n\
-	bne-	0b\n\
-" : "=&r" (__rtn) : "r" (__lock) : "cr0");
-  return __rtn;
-}
-
-
-#endif /* machine-lock.h */
diff --git a/sysdeps/powerpc/bits/memory.h b/sysdeps/powerpc/bits/memory.h
deleted file mode 100644
index 96624c3..0000000
--- a/sysdeps/powerpc/bits/memory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Memory barrier operations.  PowerPC version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_MEMORY_H
-#define _BITS_MEMORY_H	1
-
-/* Prevent read and write reordering across this function.  */
-inline void
-__memory_barrier (void)
-{
-  asm ("sync" ::: "memory");
-}
-
-/* Prevent read reordering across this function.  */
-#define __memory_read_barrier __memory_barrier
-
-/* Prevent write reordering across this function.  */
-#define __memory_write_barrier __memory_barrier
-
-#endif
diff --git a/sysdeps/powerpc/bits/spin-lock.h b/sysdeps/powerpc/bits/spin-lock.h
deleted file mode 100644
index 1dc2571..0000000
--- a/sysdeps/powerpc/bits/spin-lock.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Machine-specific definitions for spin locks.  PowerPC version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/*
- * Never include this file directly; use <pthread.h> or <cthreads.h> instead.
- */
-
-#ifndef _BITS_SPIN_LOCK_H
-#define _BITS_SPIN_LOCK_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* The type of a spin lock object.  */
-typedef __volatile int __pthread_spinlock_t;
-
-/* Initializer for a spin lock object.  */
-# define __SPIN_LOCK_INITIALIZER ((__pthread_spinlock_t) 0)
-
-#if defined __USE_EXTERN_INLINES || defined _FORCE_INLINES
-
-# ifndef __EBUSY
-#  include <errno.h>
-#  define __EBUSY EBUSY
-# endif
-
-# ifndef __PT_SPIN_INLINE
-#  define __PT_SPIN_INLINE extern __inline
-# endif
-
-__PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_destroy (__pthread_spinlock_t *__lock)
-{
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
-					  int __pshared);
-
-__PT_SPIN_INLINE int
-__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
-{
-  *__lock = __SPIN_LOCK_INITIALIZER;
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_trylock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_trylock (__pthread_spinlock_t *__lock)
-{
-  long int __rtn;
-  __asm__ __volatile__ ("\
-0:	lwarx	%0,0,%1\n\
-	stwcx.	%2,0,%1\n\
-	bne-	0b\n\
-" : "=&r" (__rtn) : "r" (__lock), "r" (1) : "cr0");
-  return __rtn ? __EBUSY : 0;
-}
-
-extern inline int __pthread_spin_lock (__pthread_spinlock_t *__lock);
-extern int _pthread_spin_lock (__pthread_spinlock_t *__lock);
-
-extern inline int
-__pthread_spin_lock (__pthread_spinlock_t *__lock)
-{
-  if (__pthread_spin_trylock (__lock))
-    return _pthread_spin_lock (__lock);
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_unlock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_unlock (__pthread_spinlock_t *__lock)
-{
-  long int __locked;
-  __asm__ __volatile__ ("\
-0:	lwarx	%0,0,%1\n\
-	stwcx.	%2,0,%1\n\
-	bne-	0b\n\
-" : "=&r" (__locked) : "r" (__lock), "r" (0) : "cr0");
-}
-
-#endif /* Use extern inlines or force inlines.  */
-
-__END_DECLS
-
-#endif /* bits/spin-lock.h */
diff --git a/sysdeps/powerpc/machine-sp.h b/sysdeps/powerpc/machine-sp.h
deleted file mode 100644
index aa787c5..0000000
--- a/sysdeps/powerpc/machine-sp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Machine-specific function to return the stack pointer.  i386 version.
-   Copyright (C) 1994,97,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _MACHINE_SP_H
-#define _MACHINE_SP_H
-
-/* Return the current stack pointer.  */
-
-#define __thread_stack_pointer() ({					      \
-  void *__sp__;								      \
-  __asm__ ("mr %0, 1" : "=r" (__sp__));					      \
-  __sp__;								      \
-})
-
-#endif	/* machine-sp.h */
diff --git a/sysdeps/powerpc/pt-machdep.h b/sysdeps/powerpc/pt-machdep.h
deleted file mode 100644
index 6d45636..0000000
--- a/sysdeps/powerpc/pt-machdep.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Machine dependent pthreads internal defenitions.  i386 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _PT_MACHDEP_H
-#define _PT_MACHDEP_H	1
-
-struct pthread_mcontext
-{
-  void *pc;
-  void *sp;
-};
-
-#endif /* pt-machdep.h */