This is my initial working version.

There is a bug in boot in this version: subhurd sometimes cannot boot.

24 files changed, 692 insertions, 0 deletions

diff --git a/libpthread/sysdeps/l4/CVS/Entries b/libpthread/sysdeps/l4/CVS/Entries
new file mode 100644
index 00000000..2566f6f3
--- /dev/null
+++ b/libpthread/sysdeps/l4/CVS/Entries
@@ -0,0 +1,9 @@
+/pt-block.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-docancel.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-stack-alloc.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-start.c/1.2/Mon Nov 18 22:20:58 2002//Tzhengda-soc2008-virt-branch
+/pt-thread-alloc.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-thread-halt.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-thread-start.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-wakeup.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+D/hurd////
diff --git a/libpthread/sysdeps/l4/CVS/Repository b/libpthread/sysdeps/l4/CVS/Repository
new file mode 100644
index 00000000..a9735deb
--- /dev/null
+++ b/libpthread/sysdeps/l4/CVS/Repository
@@ -0,0 +1 @@
+hurd/libpthread/sysdeps/l4
diff --git a/libpthread/sysdeps/l4/CVS/Root b/libpthread/sysdeps/l4/CVS/Root
new file mode 100644
index 00000000..a10aa66d
--- /dev/null
+++ b/libpthread/sysdeps/l4/CVS/Root
@@ -0,0 +1 @@
+:ext:zhengda@cvs.savannah.gnu.org:/sources/hurd
diff --git a/libpthread/sysdeps/l4/CVS/Tag b/libpthread/sysdeps/l4/CVS/Tag
new file mode 100644
index 00000000..7e454c6d
--- /dev/null
+++ b/libpthread/sysdeps/l4/CVS/Tag
@@ -0,0 +1 @@
+Tzhengda-soc2008-virt-branch
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Entries b/libpthread/sysdeps/l4/hurd/CVS/Entries
new file mode 100644
index 00000000..280c2c1f
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Entries
@@ -0,0 +1,3 @@
+/pt-sysdep.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-sysdep.h/1.2/Tue Jan 18 10:08:52 2005//Tzhengda-soc2008-virt-branch
+D/i386////
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Repository b/libpthread/sysdeps/l4/hurd/CVS/Repository
new file mode 100644
index 00000000..751f5e08
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Repository
@@ -0,0 +1 @@
+hurd/libpthread/sysdeps/l4/hurd
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Root b/libpthread/sysdeps/l4/hurd/CVS/Root
new file mode 100644
index 00000000..a10aa66d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Root
@@ -0,0 +1 @@
+:ext:zhengda@cvs.savannah.gnu.org:/sources/hurd
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Tag b/libpthread/sysdeps/l4/hurd/CVS/Tag
new file mode 100644
index 00000000..7e454c6d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Tag
@@ -0,0 +1 @@
+Tzhengda-soc2008-virt-branch
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Entries b/libpthread/sysdeps/l4/hurd/i386/CVS/Entries
new file mode 100644
index 00000000..867e57ea
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Entries
@@ -0,0 +1,3 @@
+/pt-machdep.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-setup.c/1.3/Tue Jul  1 11:43:17 2008//Tzhengda-soc2008-virt-branch
+D
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Repository b/libpthread/sysdeps/l4/hurd/i386/CVS/Repository
new file mode 100644
index 00000000..c8d46d8c
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Repository
@@ -0,0 +1 @@
+hurd/libpthread/sysdeps/l4/hurd/i386
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Root b/libpthread/sysdeps/l4/hurd/i386/CVS/Root
new file mode 100644
index 00000000..a10aa66d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Root
@@ -0,0 +1 @@
+:ext:zhengda@cvs.savannah.gnu.org:/sources/hurd
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Tag b/libpthread/sysdeps/l4/hurd/i386/CVS/Tag
new file mode 100644
index 00000000..7e454c6d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Tag
@@ -0,0 +1 @@
+Tzhengda-soc2008-virt-branch
diff --git a/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c b/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c
new file mode 100644
index 00000000..dbf5cd7e
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c
@@ -0,0 +1,20 @@
+/* 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/libpthread/sysdeps/l4/hurd/i386/pt-setup.c b/libpthread/sysdeps/l4/hurd/i386/pt-setup.c
new file mode 100644
index 00000000..6540ee5b
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/pt-setup.c
@@ -0,0 +1,74 @@
+/* Setup thread stack.  Hurd/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/l4.h>
+
+#include <pt-internal.h>
+
+/* The stack layout used on the i386 is:
+
+    -----------------
+   |  ARG            |
+    -----------------
+   |  START_ROUTINE  |
+    -----------------
+   |  0              |
+   -----------------  */
+
+/* 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)
+{
+  L4_Word_t *top;
+
+  /* Calculate top of the new stack.  */
+  top = (L4_Word_t *) ((L4_Word_t) thread->stackaddr + thread->stacksize);
+
+  if (start_routine)
+    {
+      /* Set up call frame.  */
+      top -= 2*sizeof(L4_Word_t);
+      top = (unsigned long) top & ~0xf;
+      top[1] = (L4_Word_t) arg;	/* Argument to START_ROUTINE.  */
+      top[0] = (L4_Word_t) start_routine;
+      *--top = 0;		/* Fake return address.  */
+    }
+
+  return top;
+}
+
+int
+__pthread_setup (struct __pthread *thread,
+		 void (*entry_point)(void *(*)(void *), void *),
+		 void *(*start_routine)(void *), void *arg)
+{
+  thread->mcontext.pc = entry_point;
+  thread->mcontext.sp = stack_setup (thread, start_routine, arg);
+
+  if (L4_SameThreads (thread->threadid, L4_Myself ()))
+    L4_Set_MyUserDefinedHandle (thread);
+  else
+    L4_Set_UserDefinedHandle (thread->threadid, thread);
+
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/hurd/pt-sysdep.c b/libpthread/sysdeps/l4/hurd/pt-sysdep.c
new file mode 100644
index 00000000..265592ca
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/pt-sysdep.c
@@ -0,0 +1,58 @@
+/* System dependent pthreads code.  Hurd 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.  */
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <pt-internal.h>
+
+/* Forward.  */
+static void *init_routine (void);
+
+/* OK, the name of this variable isn't really appropriate, but I don't
+   want to change it yet.  */
+void *(*_pthread_init_routine)(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)
+{
+  struct __pthread *thread;
+  int err;
+
+  /* Initialize the library.  */
+  __pthread_initialize ();
+
+  /* Create the pthread structure for the main thread (i.e. us).  */
+  err = __pthread_create_internal (&thread, 0, 0, 0);
+  assert_perror (err);
+
+  __pthread_initialize ();
+
+  /* Decrease the number of threads, to take into account that the
+     signal thread (which will be created by the startup code when we
+     return from here) shouldn't be seen as a user thread.  */
+#warning Need to implement the signal thread.
+  // __pthread_total--;
+
+  return (void *) thread->mcontext.sp;
+}
diff --git a/libpthread/sysdeps/l4/hurd/pt-sysdep.h b/libpthread/sysdeps/l4/hurd/pt-sysdep.h
new file mode 100644
index 00000000..87175330
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/pt-sysdep.h
@@ -0,0 +1,52 @@
+/* Internal defenitions for pthreads library.
+   Copyright (C) 2000, 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.  */
+
+#ifndef _PT_SYSDEP_H
+#define _PT_SYSDEP_H	1
+
+#include <l4/l4.h>
+#include <task_client.h>
+#include <machine/vmparam.h>
+
+/* XXX */
+#define _POSIX_THREAD_THREADS_MAX	64
+
+/* The default stack size.  */
+#define PTHREAD_STACK_DEFAULT	(PAGE_SIZE)
+
+#define PTHREAD_SYSDEP_MEMBERS \
+  L4_ThreadId_t threadid; \
+  L4_Word_t my_errno;
+
+extern inline struct __pthread *
+__attribute__((__always_inline__))
+_pthread_self (void)
+{
+  return (struct __pthread *) L4_MyUserDefinedHandle ();
+}
+
+extern inline void
+__pthread_stack_dealloc (void *stackaddr, size_t stacksize)
+__attribute__((__always_inline__))
+{
+  /* XXX: can only implement this once we have a working memory manager.  */
+  return;
+}
+
+#endif /* pt-sysdep.h */
diff --git a/libpthread/sysdeps/l4/pt-block.c b/libpthread/sysdeps/l4/pt-block.c
new file mode 100644
index 00000000..050c6947
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-block.c
@@ -0,0 +1,29 @@
+/* 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/l4.h>
+
+#include <pt-internal.h>
+
+/* Block THREAD.  */
+void
+__pthread_block (struct __pthread *thread)
+{
+  L4_Receive (L4_anylocalthread);
+}
diff --git a/libpthread/sysdeps/l4/pt-docancel.c b/libpthread/sysdeps/l4/pt-docancel.c
new file mode 100644
index 00000000..9a3bb26c
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-docancel.c
@@ -0,0 +1,51 @@
+/* Cancel a thread.
+   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>
+
+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_SameThreads (L4_Myself (), p->threadid))
+    call_exit ();
+  else
+    {
+      L4_Word_t dummy;
+      L4_ThreadId_t dummy_id;
+
+      /* Change the ip of the target thread to make it exit.  */
+      L4_ExchangeRegisters (p->threadid, (1 << 4), 0, call_exit,
+			    0, 0, L4_nilthread,
+			    &dummy, &dummy, &dummy, &dummy, &dummy,
+			    &dummy_id);
+    }
+
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-stack-alloc.c b/libpthread/sysdeps/l4/pt-stack-alloc.c
new file mode 100644
index 00000000..e28d5310
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-stack-alloc.c
@@ -0,0 +1,70 @@
+/* Allocate a new stack.  L4 Hurd 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.  */
+
+#include <l4/l4.h>
+#include <errno.h>
+
+#include <pt-internal.h>
+
+#define __pthread_stacksize __pthread_default_attr.stacksize
+
+#include <l4/sigma0.h>
+#include <hurd/debug.h>
+
+static void *
+allocate_page (void)
+{
+  L4_Fpage_t p;
+  /* The Kernel Interface page.  */
+  static L4_KernelInterfacePage_t *kip;
+
+  if (! kip)
+    kip = L4_GetKernelInterface ();
+
+#define sigma0_tid() (L4_GlobalId (kip->ThreadInfo.X.UserBase, 1))
+  p =  L4_Sigma0_GetPage (sigma0_tid (),
+			  L4_Fpage_Set_Attrs (L4_FpageLog2 (-1UL << 10,
+							    PAGE_SHIFT),
+					     L4_FullyAccessible));
+  p.raw &= ~0x3ff;
+
+  printf ("%s: Allocated page %x\n",
+	  __FUNCTION__, p.raw);
+
+  return (void *) p.raw;
+}
+
+
+/* Allocate a new stack of size STACKSIZE.  If successfull, 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)
+{
+  if (stacksize != __pthread_stacksize)
+    return EINVAL;
+
+  *stackaddr = allocate_page ();
+  if (! *stackaddr)
+    return EAGAIN;
+  
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-start.c b/libpthread/sysdeps/l4/pt-start.c
new file mode 100644
index 00000000..fb4e27be
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-start.c
@@ -0,0 +1,103 @@
+/* Start thread.  L4 Hurd 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 <assert.h>
+#include <errno.h>
+#include <string.h>
+
+#include <pt-internal.h>
+
+#include "task_client.h"
+
+extern L4_ThreadId_t __system_pager;
+extern L4_ThreadId_t __task_server;
+
+#ifndef WORKING_EXREGS
+static void
+send_startup_ipc (L4_ThreadId_t id, L4_Word_t ip, L4_Word_t sp)
+{
+  L4_Msg_t msg;
+
+  printf ("%s: Sending startup message to %x, "
+	  "(ip=%x, sp=%x)\n",
+	  __FUNCTION__, * (L4_Word_t *) &id, ip, sp);
+
+  L4_Clear (&msg);
+#ifdef HAVE_PROPAGATION
+  L4_Set_VirtualSender (pager_tid);
+  L4_Set_Propagation (&msg.tag);
+#endif
+  L4_Append_Word (&msg, ip);
+  L4_Append_Word (&msg, sp);
+#ifndef HAVE_PROPAGATION
+  L4_Append_Word (&msg, *(L4_Word_t *) &id);
+  id = __system_pager;
+#if 0
+  DODEBUG (2, printf ("%s: Redirecting start request to pager (%x).\n",
+		      __FUNCTION__, * (L4_Word_t *) &id));
+#endif
+#endif
+  L4_LoadMsg (&msg);
+  L4_Send (id);
+}
+#endif
+
+/* Start THREAD.  We allocate all system-specific resources, including
+   a kernel thread, set it up, and get it running.  */
+int
+__pthread_start (struct __pthread *thread)
+{
+  error_t err;
+
+  if (__pthread_num_threads == 1)
+    /* The main thread is already running: do nothing.  */
+    {
+      assert (__pthread_total == 1);
+      thread->threadid = L4_Myself ();
+    }
+  else
+    {
+      CORBA_Environment env;
+
+      env = idl4_default_environment;
+      err = thread_create (__task_server,
+			   L4_Version (L4_Myself ()),
+			   * (L4_Word_t *) &__system_pager,
+			   (L4_Word_t *) &thread->threadid, &env);
+      if (err)
+	return EAGAIN;
+
+      env = idl4_default_environment;
+      err = thread_resume (__task_server,
+			   * (L4_Word_t *) &thread->threadid,
+			   &env);
+      assert (! err);
+
+#ifndef WORKING_EXREGS
+      L4_AbortIpc_and_stop (thread->threadid);
+      L4_Start_SpIp (thread->threadid, (L4_Word_t) thread->mcontext.sp,
+		     (L4_Word_t) thread->mcontext.pc);
+#endif
+      send_startup_ipc (thread->threadid, (L4_Word_t) thread->mcontext.pc,
+			(L4_Word_t) thread->mcontext.sp);
+
+    }
+
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-thread-alloc.c b/libpthread/sysdeps/l4/pt-thread-alloc.c
new file mode 100644
index 00000000..a9d5e212
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-thread-alloc.c
@@ -0,0 +1,52 @@
+/* Start 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 <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)
+{
+  error_t err;
+
+  /* The main thread is already running of course.  */
+  if (__pthread_num_threads == 1)
+    {
+      assert (__pthread_total == 1);
+      thread->thread_id = L4_Myself ();
+    }
+  else
+    {
+      CORBA_Environment env;
+
+      env = idl4_default_environment;
+      err = thread_create (__task_server,
+			   L4_Version (L4_Myself ()),
+			   * (L4_Word_t *) &__system_pager,
+			   (L4_Word_t *) &thread->threadid, &env);
+      if (err)
+	return EAGAIN;
+    }
+
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-thread-halt.c b/libpthread/sysdeps/l4/pt-thread-halt.c
new file mode 100644
index 00000000..04d622f4
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-thread-halt.c
@@ -0,0 +1,38 @@
+/* Deallocate the kernel thread resources.  Mach 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 <mach.h>
+
+#include <pt-internal.h>
+
+extern L4_ThreadId_t __task_server;
+
+/* Deallocate the kernel thread resources associated with THREAD.  */
+void
+__pthread_thread_halt (struct __pthread *thread)
+{
+  CORBA_Environment env = idl4_default_environment;
+  L4_Word_t *t = (L4_Word_t *) &thread->threadid;
+
+  assert (*t);
+  assert (thread_terminate (__task_server, *t, &env));
+  *t = 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-thread-start.c b/libpthread/sysdeps/l4/pt-thread-start.c
new file mode 100644
index 00000000..c428d290
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-thread-start.c
@@ -0,0 +1,92 @@
+/* Start 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 <assert.h>
+#include <errno.h>
+#include <string.h>
+
+#include <pt-internal.h>
+
+#include "task_client.h"
+
+extern L4_ThreadId_t __system_pager;
+extern L4_ThreadId_t __task_server;
+
+#ifndef WORKING_EXREGS
+static void
+send_startup_ipc (L4_ThreadId_t id, L4_Word_t ip, L4_Word_t sp)
+{
+  L4_Msg_t msg;
+
+  printf ("%s: Sending startup message to %x, "
+	  "(ip=%x, sp=%x)\n",
+	  __FUNCTION__, * (L4_Word_t *) &id, ip, sp);
+
+  L4_Clear (&msg);
+#ifdef HAVE_PROPAGATION
+  L4_Set_VirtualSender (pager_tid);
+  L4_Set_Propagation (&msg.tag);
+#endif
+  L4_Append_Word (&msg, ip);
+  L4_Append_Word (&msg, sp);
+#ifndef HAVE_PROPAGATION
+  L4_Append_Word (&msg, *(L4_Word_t *) &id);
+  id = __system_pager;
+#if 0
+  DODEBUG (2, printf ("%s: Redirecting start request to pager (%x).\n",
+		      __FUNCTION__, * (L4_Word_t *) &id));
+#endif
+#endif
+  L4_LoadMsg (&msg);
+  L4_Send (id);
+}
+#endif
+
+/* Start THREAD.  Get the kernel thread scheduled and running.  */
+int
+__pthread_thread_start (struct __pthread *thread)
+{
+  error_t err;
+
+  /* The main thread is already running of course.  */
+  if (__pthread_num_threads == 1)
+    {
+      assert (__pthread_total == 1);
+      assert (thread->thread_id == L4_Myself ());
+    }
+  else
+    {
+      env = idl4_default_environment;
+      err = thread_resume (__task_server,
+			   * (L4_Word_t *) &thread->threadid,
+			   &env);
+      assert (! err);
+
+#ifndef WORKING_EXREGS
+      L4_AbortIpc_and_stop (thread->threadid);
+      L4_Start_SpIp (thread->threadid, (L4_Word_t) thread->mcontext.sp,
+		     (L4_Word_t) thread->mcontext.pc);
+#endif
+      send_startup_ipc (thread->threadid, (L4_Word_t) thread->mcontext.pc,
+			(L4_Word_t) thread->mcontext.sp);
+
+    }
+
+  return 0;
+}
diff --git a/libpthread/sysdeps/l4/pt-wakeup.c b/libpthread/sysdeps/l4/pt-wakeup.c
new file mode 100644
index 00000000..7b00e4f6
--- /dev/null
+++ b/libpthread/sysdeps/l4/pt-wakeup.c
@@ -0,0 +1,29 @@
+/* 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/l4.h>
+
+#include <pt-internal.h>
+
+/* Wakeup THREAD.  */
+void
+__pthread_wakeup (struct __pthread *thread)
+{
+  L4_Send (thread->threadid);
+}