Merge commit 'refs/top-bases/t/stand-alone' into t/stand-alonet/stand-alone

Conflicts:
	Makefile.am

1 files changed, 0 insertions, 42 deletions

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;
-}