Remove libpthread, now in eglibc

130 files changed, 0 insertions, 5166 deletions

diff --git a/libpthread/sysdeps/generic/bits/barrier-attr.h b/libpthread/sysdeps/generic/bits/barrier-attr.h
deleted file mode 100644
index a9900b71..00000000
--- a/libpthread/sysdeps/generic/bits/barrier-attr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Thread barrier attribute type.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_BARRIER_ATTR_H
-#define _BITS_BARRIER_ATTR_H	1
-
-enum __pthread_process_shared;
-
-/* This structure describes the attributes of a POSIX thread barrier.
-   Note that not all of them are supported on all systems.  */
-struct __pthread_barrierattr
-{
-  enum __pthread_process_shared pshared;
-};
-
-#endif /* bits/barrier-attr.h */
diff --git a/libpthread/sysdeps/generic/bits/barrier.h b/libpthread/sysdeps/generic/bits/barrier.h
deleted file mode 100644
index 5e559312..00000000
--- a/libpthread/sysdeps/generic/bits/barrier.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Thread barrier attribute type.  Generic 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.  */
-
-#ifndef _BITS_BARRIER_H
-#define _BITS_BARRIER_H	1
-
-#include <bits/spin-lock.h>
-
-/* This structure describes the attributes of a POSIX barrier.  */
-struct __pthread_barrier
-{
-  __pthread_spinlock_t lock;
-  struct __pthread *queue; /* List of waiters.  */
-  unsigned pending;	/* Number of that still need to wait on
-			   barrier.  */
-  unsigned count;	/* Number of threads that must wait before
-			   barrier is passed.  */
-  struct __pthread_barrierattr *attr;
-  void *data;
-};
-
-
-#endif /* bits/barrier.h */
diff --git a/libpthread/sysdeps/generic/bits/cancelation.h b/libpthread/sysdeps/generic/bits/cancelation.h
deleted file mode 100644
index 46486f5e..00000000
--- a/libpthread/sysdeps/generic/bits/cancelation.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Cancelation.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_CANCELATION_H
-#define _BITS_CANCELATION_H	1
-
-struct __pthread_cancelation_handler
-{
-  void (*handler)(void *);
-  void *arg;
-  struct __pthread_cancelation_handler *next;
-};
-
-/* Returns the thread local location of the cleanup handler stack.  */
-struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
-
-#define __pthread_cleanup_push(rt, rtarg) \
-	{ \
-	  struct __pthread_cancelation_handler **__handlers \
-	    = __pthread_get_cleanup_stack (); \
-	  struct __pthread_cancelation_handler __handler = \
-	    { \
-	      (rt), \
-	      (rtarg), \
-	      *__handlers \
-	    }; \
-	  *__handlers = &__handler;
-	  
-#define __pthread_cleanup_pop(execute) \
-	  if (execute) \
-	    __handler.handler (__handler.arg); \
-	  *__handlers = __handler.next; \
-	}
-
-#endif /* _BITS_CANCELATION_H */
diff --git a/libpthread/sysdeps/generic/bits/condition-attr.h b/libpthread/sysdeps/generic/bits/condition-attr.h
deleted file mode 100644
index 4cd4e8c4..00000000
--- a/libpthread/sysdeps/generic/bits/condition-attr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Condition attribute type.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_CONDITION_ATTR_H
-#define _BITS_CONDITION_ATTR_H	1
-
-#include <bits/types.h>
-
-enum __pthread_process_shared;
-
-/* User visible part of a condition attribute variable.  */
-struct __pthread_condattr
-  {
-    enum __pthread_process_shared pshared;
-    __clockid_t clock;
-  };
-
-#endif /* bits/condition.h */
diff --git a/libpthread/sysdeps/generic/bits/condition.h b/libpthread/sysdeps/generic/bits/condition.h
deleted file mode 100644
index bf13adab..00000000
--- a/libpthread/sysdeps/generic/bits/condition.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Condition type.  Generic version.
-   Copyright (C) 2000, 2005, 2009 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_CONDITION_H
-#define _BITS_CONDITION_H	1
-
-#include <bits/spin-lock.h>
-
-/* User visible part of a condition variable.  */
-struct __pthread_cond
-  {
-    __pthread_spinlock_t __lock;
-    struct __pthread *__queue;
-    struct __pthread_condattr *__attr;
-    struct __pthread_condimpl *__impl;
-    void *__data;
-  };
-
-/* Initializer for a condition variable.  */
-#define __PTHREAD_COND_INITIALIZER \
-  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL }
-
-#endif /* bits/condition.h */
diff --git a/libpthread/sysdeps/generic/bits/mutex-attr.h b/libpthread/sysdeps/generic/bits/mutex-attr.h
deleted file mode 100644
index 8514ebe8..00000000
--- a/libpthread/sysdeps/generic/bits/mutex-attr.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Mutex attribute type.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_MUTEX_ATTR_H
-#define _BITS_MUTEX_ATTR_H	1
-
-enum __pthread_mutex_protocol;
-enum __pthread_process_shared;
-enum __pthread_mutex_type;
-
-/* This structure describes the attributes of a POSIX mutex
-   attribute.  */
-struct __pthread_mutexattr
-{
-  int prioceiling;
-  enum __pthread_mutex_protocol protocol;
-  enum __pthread_process_shared pshared;
-  enum __pthread_mutex_type mutex_type;
-};
-
-/* Attributes for a recursive mutex.  */
-extern const struct __pthread_mutexattr __pthread_errorcheck_mutexattr;
-extern const struct __pthread_mutexattr __pthread_recursive_mutexattr;
-
-#endif /* bits/mutex-attr.h */
diff --git a/libpthread/sysdeps/generic/bits/mutex.h b/libpthread/sysdeps/generic/bits/mutex.h
deleted file mode 100644
index c734c393..00000000
--- a/libpthread/sysdeps/generic/bits/mutex.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Mutex type.  Generic version.
-
-   Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008, 2009
-     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_MUTEX_H
-
-#ifndef __need_pthread_mutex
-# define _BITS_MUTEX_H	1
-#endif
-
-#ifndef __pthread_mutex_defined
-# if defined __need_pthread_mutex || defined _BITS_MUTEX_H
-#  undef __need_pthread_mutex
-#  define __pthread_mutex_defined
-
-#  include <bits/spin-lock.h>
-#  include <bits/mutex-attr.h>
-
-/* User visible part of a mutex.  */
-struct __pthread_mutex
-  {
-    __pthread_spinlock_t __held;
-    __pthread_spinlock_t __lock;
-    /* In cthreads, mutex_init does not initialized thre third
-       pointer, as such, we cannot rely on its value for anything.  */
-    char *cthreadscompat1;
-    struct __pthread *__queue;
-    struct __pthread_mutexattr *attr;
-    void *data;
-    /*  Up to this point, we are completely compatible with cthreads
-	and what libc expects.  */
-    void *owner;
-    unsigned locks;
-    /* If NULL then the default attributes apply.  */
-  };
-
-/* Initializer for a mutex.  N.B.  this also happens to be compatible
-   with the cthread mutex initializer.  */
-#  define __PTHREAD_MUTEX_INITIALIZER \
-    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 }
-
-#  define __PTHREAD_ERRORCHECK_MUTEXATTR ((struct __pthread_mutexattr *) ((unsigned long) __PTHREAD_MUTEX_ERRORCHECK + 1))
-
-#  define __PTHREAD_ERRORCHECK_MUTEX_INITIALIZER \
-    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0,	\
-	__PTHREAD_ERRORCHECK_MUTEXATTR, 0, 0, 0 }
-
-#  define __PTHREAD_RECURSIVE_MUTEXATTR ((struct __pthread_mutexattr *) ((unsigned long) __PTHREAD_MUTEX_RECURSIVE + 1))
-
-#  define __PTHREAD_RECURSIVE_MUTEX_INITIALIZER \
-    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0,	\
-	__PTHREAD_RECURSIVE_MUTEXATTR, 0, 0, 0 }
-
-# endif
-#endif /* Not __pthread_mutex_defined.  */
-
-#endif /* bits/mutex.h */
diff --git a/libpthread/sysdeps/generic/bits/once.h b/libpthread/sysdeps/generic/bits/once.h
deleted file mode 100644
index f4985d6f..00000000
--- a/libpthread/sysdeps/generic/bits/once.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Dynamic package initialization data structures.  Generic version.
-   Copyright (C) 2002, 2009 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_ONCE_H
-#define _BITS_ONCE_H	1
-
-#include <bits/spin-lock.h>
-
-struct __pthread_once
-{
-  int run;
-  __pthread_spinlock_t lock;
-};
-
-#define __PTHREAD_ONCE_INIT \
-	{ 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
-
-#endif /* bits/once.h */
diff --git a/libpthread/sysdeps/generic/bits/pthread-np.h b/libpthread/sysdeps/generic/bits/pthread-np.h
deleted file mode 100644
index d5ddbb05..00000000
--- a/libpthread/sysdeps/generic/bits/pthread-np.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Non-portable functions. Generic 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
-
-#endif /* bits/pthread-np.h */
diff --git a/libpthread/sysdeps/generic/bits/pthread.h b/libpthread/sysdeps/generic/bits/pthread.h
deleted file mode 100644
index 80e6b096..00000000
--- a/libpthread/sysdeps/generic/bits/pthread.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Pthread data structures.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_PTHREAD_H
-#define _BITS_PTHREAD_H	1
-
-typedef int __pthread_t;
-
-/* Return true if __T1 and __T2 both name the same thread.  Otherwise,
-   false.  */
-extern int
-__pthread_equal (__pthread_t __t1, __pthread_t __t2);
-
-#ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__pthread_equal (__pthread_t __t1, __pthread_t __t2)
-{
-  return __t1 == __t2;
-}
-#endif
-
-#endif /* bits/pthread.h */
diff --git a/libpthread/sysdeps/generic/bits/pthreadtypes.h b/libpthread/sysdeps/generic/bits/pthreadtypes.h
deleted file mode 100644
index e5cbfd2a..00000000
--- a/libpthread/sysdeps/generic/bits/pthreadtypes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
-   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.  */
-
-#if !defined _BITS_TYPES_H && !defined _PTHREAD_H
-# error "Never include <bits/pthreadtypes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef _BITS_PTHREADTYPES_H
-#define _BITS_PTHREADTYPES_H    1
-
-#include <pthread.h>
-
-#endif /* bits/pthreadtypes.h */
diff --git a/libpthread/sysdeps/generic/bits/rwlock-attr.h b/libpthread/sysdeps/generic/bits/rwlock-attr.h
deleted file mode 100644
index dba99f1d..00000000
--- a/libpthread/sysdeps/generic/bits/rwlock-attr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Thread rwlock attribute type.  Generic version.
-   Copyright (C) 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.  */
-
-#ifndef _BITS_RWLOCK_ATTR_H
-#define _BITS_RWLOCK_ATTR_H	1
-
-enum __pthread_process_shared;
-
-/* This structure describes the attributes of a POSIX thread rwlock.
-   Note that not all of them are supported on all systems.  */
-struct __pthread_rwlockattr
-{
-  enum __pthread_process_shared pshared;
-};
-
-#endif /* bits/rwlock-attr.h */
diff --git a/libpthread/sysdeps/generic/bits/rwlock.h b/libpthread/sysdeps/generic/bits/rwlock.h
deleted file mode 100644
index af6b1c86..00000000
--- a/libpthread/sysdeps/generic/bits/rwlock.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* rwlock type.  Generic version.
-   Copyright (C) 2002, 2005, 2006, 2007, 2009 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_RWLOCK_H
-#define _BITS_RWLOCK_H
-
-#include <bits/spin-lock.h>
-
-/* User visible part of a rwlock.  If __held is not held and readers
-   is 0, then the lock is unlocked.  If __held is held and readers is
-   0, then the lock is held by a writer.  If __held is held and
-   readers is greater than 0, then the lock is held by READERS
-   readers.  */
-struct __pthread_rwlock
-  {
-    __pthread_spinlock_t __held;
-    __pthread_spinlock_t __lock;
-    int readers;
-    struct __pthread *readerqueue;
-    struct __pthread *writerqueue;
-    struct __pthread_rwlockattr *__attr;
-    void *__data;
-  };
-
-/* Initializer for a rwlock.  */
-#define __PTHREAD_RWLOCK_INITIALIZER \
-    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0 }
-
-
-#endif /* bits/rwlock.h */
diff --git a/libpthread/sysdeps/generic/bits/semaphore.h b/libpthread/sysdeps/generic/bits/semaphore.h
deleted file mode 100644
index 5e987c15..00000000
--- a/libpthread/sysdeps/generic/bits/semaphore.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Semaphore type.  Generic version.
-   Copyright (C) 2005, 2009 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_SEMAPHORE_H
-#define _BITS_SEMAPHORE_H	1
-
-#ifndef _SEMAPHORE_H
-#error Never include <bits/semaphore.h> directly.
-#endif
-
-#include <pthread.h>
-
-/* User visible part of a semaphore.  */
-struct __semaphore
-  {
-    __pthread_spinlock_t __lock;
-    struct __pthread *__queue;
-    int __pshared;
-    int __value;
-    void *__data;
-  };
-
-/* Initializer for a semaphore.  */
-#define __SEMAPHORE_INITIALIZER(pshared, value) \
-  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, (pshared), (value), NULL }
-
-#endif /* bits/mutex.h */
diff --git a/libpthread/sysdeps/generic/bits/thread-attr.h b/libpthread/sysdeps/generic/bits/thread-attr.h
deleted file mode 100644
index f2e55f2b..00000000
--- a/libpthread/sysdeps/generic/bits/thread-attr.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Thread attribute type.  Generic 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.  */
-
-#ifndef _BITS_THREAD_ATTR_H
-#define _BITS_THREAD_ATTR_H	1
-
-#define __need_schedparam
-#include <bits/sched.h>
-
-enum __pthread_detachstate;
-enum __pthread_inheritsched;
-enum __pthread_contentionscope;
-
-/* This structure describes the attributes of a POSIX thread.  Note
-   that not all of them are supported on all systems.  */
-struct __pthread_attr
-{
-  struct __sched_param schedparam;
-  void *stackaddr;
-  size_t stacksize;
-  size_t guardsize;
-  enum __pthread_detachstate detachstate;
-  enum __pthread_inheritsched inheritsched;
-  enum __pthread_contentionscope contentionscope;
-  int schedpolicy;
-};
-
-#endif /* bits/thread-attr.h */
diff --git a/libpthread/sysdeps/generic/bits/thread-specific.h b/libpthread/sysdeps/generic/bits/thread-specific.h
deleted file mode 100644
index b42d99e7..00000000
--- a/libpthread/sysdeps/generic/bits/thread-specific.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Thread specific data.  Generic 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.  */
-
-#ifndef _BITS_THREAD_SPECIFIC_H
-#define _BITS_THREAD_SPECIFIC_H	1
-
-typedef int __pthread_key;
-
-#endif /* bits/thread-specific.h */
diff --git a/libpthread/sysdeps/generic/killpg.c b/libpthread/sysdeps/generic/killpg.c
deleted file mode 100644
index 7f7ed87d..00000000
--- a/libpthread/sysdeps/generic/killpg.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* killpg.c - Generic killpg 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 "sig-internal.h"
-
-int
-killpg (pid_t pid, int sig)
-{
-  return kill (-pid, sig);
-}
diff --git a/libpthread/sysdeps/generic/pt-atfork.c b/libpthread/sysdeps/generic/pt-atfork.c
deleted file mode 100644
index 32e1e78c..00000000
--- a/libpthread/sysdeps/generic/pt-atfork.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Register fork handlers.  Generic 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>
-
-int
-pthread_atfork (void (*prepare) (void),
-		void (*parent) (void),
-		void (*child) (void))
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-destroy.c b/libpthread/sysdeps/generic/pt-attr-destroy.c
deleted file mode 100644
index c4b9aa54..00000000
--- a/libpthread/sysdeps/generic/pt-attr-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_attr_destroy.  Generic 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>
-
-int
-pthread_attr_destroy (pthread_attr_t *attr)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getdetachstate.c b/libpthread/sysdeps/generic/pt-attr-getdetachstate.c
deleted file mode 100644
index be406f1d..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getdetachstate.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getdetachstate.  Generic 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>
-
-int
-pthread_attr_getdetachstate (const pthread_attr_t *attr,
-			     int *detachstate)
-{
-  *detachstate = attr->detachstate;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getguardsize.c b/libpthread/sysdeps/generic/pt-attr-getguardsize.c
deleted file mode 100644
index c1d9f13e..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getguardsize.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getguardsize.  Generic 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>
-
-int
-pthread_attr_getguardsize (const pthread_attr_t *attr,
-			   size_t *guardsize)
-{
-  *guardsize = attr->guardsize;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getinheritsched.c b/libpthread/sysdeps/generic/pt-attr-getinheritsched.c
deleted file mode 100644
index cca4e3d7..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getinheritsched.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getinheritsched.  Generic 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>
-
-int
-pthread_attr_getinheritsched (const pthread_attr_t *attr,
-			      int *inheritsched)
-{
-  *inheritsched = attr->inheritsched;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getschedparam.c b/libpthread/sysdeps/generic/pt-attr-getschedparam.c
deleted file mode 100644
index 190cf9d0..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getschedparam.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* pthread_attr_getschedparam.  Generic 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 <sched.h>
-#include <string.h>
-
-#include <pt-internal.h>
-
-int
-pthread_attr_getschedparam (const pthread_attr_t *attr,
-			    struct sched_param *param)
-{
-  memcpy (param, &attr->schedparam, sizeof *param);
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c b/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c
deleted file mode 100644
index 4349a238..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getschedpolicy.  Generic 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>
-
-int
-pthread_attr_getschedpolicy (const pthread_attr_t *attr,
-			     int *policy)
-{
-  *policy = attr->schedpolicy;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getscope.c b/libpthread/sysdeps/generic/pt-attr-getscope.c
deleted file mode 100644
index 97198fa5..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getscope.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getscope.  Generic 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>
-
-int
-pthread_attr_getscope (const pthread_attr_t *attr,
-		       int *contentionscope)
-{
-  *contentionscope = attr->contentionscope;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getstack.c b/libpthread/sysdeps/generic/pt-attr-getstack.c
deleted file mode 100644
index 7beb79f0..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getstack.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* pthread_attr_getstack.  Generic 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>
-
-int
-pthread_attr_getstack (const pthread_attr_t *attr,
-		       void **stackaddr,
-		       size_t *stacksize)
-{
-  pthread_attr_getstackaddr (attr, stackaddr);
-  pthread_attr_getstacksize (attr, stacksize);
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getstackaddr.c b/libpthread/sysdeps/generic/pt-attr-getstackaddr.c
deleted file mode 100644
index d43eeff7..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getstackaddr.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getstackaddr.  Generic 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>
-
-int
-pthread_attr_getstackaddr (const pthread_attr_t *attr,
-			   void **stackaddr)
-{
-  *stackaddr = attr->stackaddr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-getstacksize.c b/libpthread/sysdeps/generic/pt-attr-getstacksize.c
deleted file mode 100644
index c1bc6617..00000000
--- a/libpthread/sysdeps/generic/pt-attr-getstacksize.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_getstacksize.  Generic 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>
-
-int
-pthread_attr_getstacksize (const pthread_attr_t *attr,
-			   size_t *stacksize)
-{
-  *stacksize = attr->stacksize;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-init.c b/libpthread/sysdeps/generic/pt-attr-init.c
deleted file mode 100644
index 6a930e30..00000000
--- a/libpthread/sysdeps/generic/pt-attr-init.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_attr_init.  Generic 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>
-
-int
-pthread_attr_init (pthread_attr_t *attr)
-{
-  *attr = __pthread_default_attr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setdetachstate.c b/libpthread/sysdeps/generic/pt-attr-setdetachstate.c
deleted file mode 100644
index 688ba5d6..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setdetachstate.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* pthread_attr_setdetachstate.  Generic 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>
-
-int
-pthread_attr_setdetachstate (pthread_attr_t *attr,
-			     int detachstate)
-{
-  switch (detachstate)
-    {
-    case PTHREAD_CREATE_DETACHED:
-    case PTHREAD_CREATE_JOINABLE:
-      attr->detachstate = detachstate;
-      break;
-    default:
-      return EINVAL;
-    }
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setguardsize.c b/libpthread/sysdeps/generic/pt-attr-setguardsize.c
deleted file mode 100644
index b2ba0f0f..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setguardsize.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_setguardsize.  Generic 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>
-
-int
-pthread_attr_setguardsize (pthread_attr_t *attr,
-			   size_t guardsize)
-{
-  attr->guardsize = guardsize;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setinheritsched.c b/libpthread/sysdeps/generic/pt-attr-setinheritsched.c
deleted file mode 100644
index e9012c58..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setinheritsched.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* pthread_attr_setinheritsched.  Generic 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>
-
-int
-pthread_attr_setinheritsched (pthread_attr_t *attr,
-			      int inheritsched)
-{
-  switch (inheritsched)
-    {
-    case PTHREAD_INHERIT_SCHED:
-    case PTHREAD_EXPLICIT_SCHED:
-      attr->inheritsched = inheritsched;
-      break;
-    default:
-      return EINVAL;
-    }
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setschedparam.c b/libpthread/sysdeps/generic/pt-attr-setschedparam.c
deleted file mode 100644
index 5459f108..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setschedparam.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* pthread_attr_getschedparam.  Generic 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 <sched.h>
-#include <string.h>
-
-#include <pt-internal.h>
-
-int
-pthread_attr_setschedparam (pthread_attr_t *attr,
-			    const struct sched_param *param)
-{
-  if (memcmp (param, &__pthread_default_attr.schedparam,
-	      sizeof *param) == 0)
-    {
-      memcpy (&attr->schedparam, param, sizeof *param);
-      return 0;
-    }
-
-  return ENOTSUP;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c b/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c
deleted file mode 100644
index e481d04c..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* pthread_attr_getschedpolicy.  Generic 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>
-
-int
-pthread_attr_setschedpolicy (pthread_attr_t *attr,
-			     int policy)
-{
-  switch (policy)
-    {
-    case SCHED_OTHER:
-      attr->schedpolicy = policy;
-      break;
-
-    case SCHED_FIFO:
-    case SCHED_RR:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-    }
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setscope.c b/libpthread/sysdeps/generic/pt-attr-setscope.c
deleted file mode 100644
index c74a4f67..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setscope.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* pthread_attr_setscope.  Generic 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>
-
-int
-pthread_attr_setscope (pthread_attr_t *attr,
-		       int contentionscope)
-{
-  if (contentionscope == __pthread_default_attr.contentionscope)
-    {
-      attr->contentionscope = contentionscope;
-      return 0;
-    }
-
-  switch (contentionscope)
-    {
-    case PTHREAD_SCOPE_PROCESS:
-    case PTHREAD_SCOPE_SYSTEM:
-      return ENOTSUP;
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setstack.c b/libpthread/sysdeps/generic/pt-attr-setstack.c
deleted file mode 100644
index 360d27a3..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setstack.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* pthread_attr_setstack.  Generic 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 <assert.h>
-
-#include <pt-internal.h>
-
-int
-pthread_attr_setstack (pthread_attr_t *attr,
-		       void *stackaddr,
-		       size_t stacksize)
-{
-  int err;
-  size_t s;
-
-  /* pthread_attr_setstack should always succeed, thus we set the size
-     first as it is more discriminating.  */
-  pthread_attr_getstacksize (attr, &s);
-
-  err = pthread_attr_setstacksize (attr, stacksize);
-  if (err)
-    return err;
-
-  err = pthread_attr_setstackaddr (attr, stackaddr);
-  if (err)
-    {
-      int e = pthread_attr_setstacksize (attr, s);
-      assert_perror (e);
-
-      return err;
-    }
-      
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setstackaddr.c b/libpthread/sysdeps/generic/pt-attr-setstackaddr.c
deleted file mode 100644
index 431f2d0c..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setstackaddr.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_attr_setstackaddr.  Generic 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>
-
-int
-pthread_attr_setstackaddr (pthread_attr_t *attr,
-			   void *stackaddr)
-{
-  attr->stackaddr = stackaddr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr-setstacksize.c b/libpthread/sysdeps/generic/pt-attr-setstacksize.c
deleted file mode 100644
index d0e51022..00000000
--- a/libpthread/sysdeps/generic/pt-attr-setstacksize.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* pthread_attr_setstacksize.  Generic 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>
-
-int
-pthread_attr_setstacksize (pthread_attr_t *attr,
-			   size_t stacksize)
-{
-  if (stacksize == __pthread_default_attr.stacksize)
-    {
-      attr->stacksize = stacksize;
-
-      /* The guard size cannot be larger than the stack itself, as
-	 such, if the new stack size is smaller than the guard size,
-	 we squash the guard size.  */
-      if (attr->guardsize > attr->stacksize)
-	attr->guardsize = attr->stacksize;
-
-      return 0;
-    }
-
-  return ENOTSUP;
-}
diff --git a/libpthread/sysdeps/generic/pt-attr.c b/libpthread/sysdeps/generic/pt-attr.c
deleted file mode 100644
index 769f292a..00000000
--- a/libpthread/sysdeps/generic/pt-attr.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Default attributes.  Generic 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 <pthread.h>
-#include <sched.h>
-#include <stddef.h>
-#include <limits.h>
-
-#include <pt-internal.h>
-
-const struct __pthread_attr __pthread_default_attr =
-{
-  schedparam: { sched_priority: 0 },
-  stacksize: PTHREAD_STACK_DEFAULT,
-  stackaddr: NULL,
-#ifdef PAGESIZE
-  guardsize: PAGESIZE,
-#else
-  guardsize: 0,
-#endif /* PAGESIZE */
-  detachstate: PTHREAD_CREATE_JOINABLE,
-  inheritsched: PTHREAD_EXPLICIT_SCHED,
-  contentionscope: PTHREAD_SCOPE_SYSTEM,
-  schedpolicy: SCHED_OTHER
-};
diff --git a/libpthread/sysdeps/generic/pt-barrier-destroy.c b/libpthread/sysdeps/generic/pt-barrier-destroy.c
deleted file mode 100644
index 01b938b4..00000000
--- a/libpthread/sysdeps/generic/pt-barrier-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_barrier_destroy.  Generic 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>
-
-int
-pthread_barrier_destroy (pthread_barrier_t *barrier)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-barrier-init.c b/libpthread/sysdeps/generic/pt-barrier-init.c
deleted file mode 100644
index c42b3bb6..00000000
--- a/libpthread/sysdeps/generic/pt-barrier-init.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* pthread_barrier_init.  Generic version.
-   Copyright (C) 2002, 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 <pthread.h>
-#include <string.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-pthread_barrier_init (pthread_barrier_t *barrier,
-		      const pthread_barrierattr_t *attr,
-		      unsigned count)
-{
-  if (count == 0)
-    return EINVAL;
-
-  memset (barrier, 0, sizeof *barrier);
-
-  barrier->lock = PTHREAD_SPINLOCK_INITIALIZER;
-  barrier->pending = count;
-  barrier->count = count;
-
-  if (! attr
-      || memcmp (attr, &__pthread_default_barrierattr, sizeof (*attr) == 0))
-    /* Use the default attributes.  */
-    return 0;
-
-  /* Non-default attributes.  */
-
-  barrier->attr = malloc (sizeof *attr);
-  if (! barrier->attr)
-    return ENOMEM;
-
-  *barrier->attr = *attr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-barrier-wait.c b/libpthread/sysdeps/generic/pt-barrier-wait.c
deleted file mode 100644
index f1de250a..00000000
--- a/libpthread/sysdeps/generic/pt-barrier-wait.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* pthread_barrier_wait.  Generic 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 <assert.h>
-
-#include <pt-internal.h>
-
-int
-pthread_barrier_wait (pthread_barrier_t *barrier)
-{
-  __pthread_spin_lock (&barrier->lock);
-  if (-- barrier->pending == 0)
-    {
-      barrier->pending = barrier->count;
-
-      if (barrier->count > 1)
-	{
-	  struct __pthread *wakeup;
-
-	  wakeup = barrier->queue;
-	  barrier->queue = NULL;
-	  __pthread_spin_unlock (&barrier->lock);
-
-	  /* We can safely walk the list of waiting threads without
-	     holding the lock since it is decoupled from the barrier
-	     variable now.  */
-	  __pthread_dequeuing_iterate (wakeup, wakeup)
-	    __pthread_wakeup (wakeup);
-	}
-
-      return PTHREAD_BARRIER_SERIAL_THREAD;
-    }
-  else
-    {
-      struct __pthread *self = _pthread_self ();
-
-      /* Add ourselves to the list of waiters.  */
-      __pthread_enqueue (&barrier->queue, self);
-      __pthread_spin_unlock (&barrier->lock);
-
-      __pthread_block (self);
-      return 0;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-barrier.c b/libpthread/sysdeps/generic/pt-barrier.c
deleted file mode 100644
index d772719f..00000000
--- a/libpthread/sysdeps/generic/pt-barrier.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Default barrier attributes.  Generic 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>
-
-const struct __pthread_barrierattr __pthread_default_barrierattr =
-{
-  pshared: PTHREAD_PROCESS_PRIVATE
-};
diff --git a/libpthread/sysdeps/generic/pt-barrierattr-destroy.c b/libpthread/sysdeps/generic/pt-barrierattr-destroy.c
deleted file mode 100644
index eb396347..00000000
--- a/libpthread/sysdeps/generic/pt-barrierattr-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_barrierattr_destroy.  Generic 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>
-
-int
-pthread_barrierattr_destroy (pthread_barrierattr_t *attr)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c b/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c
deleted file mode 100644
index ed2cdd24..00000000
--- a/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_barrierattr_getpshared.  Generic 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>
-
-int
-pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr,
-				int *pshared)
-{
-  *pshared = attr->pshared;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-barrierattr-init.c b/libpthread/sysdeps/generic/pt-barrierattr-init.c
deleted file mode 100644
index 45f16cc8..00000000
--- a/libpthread/sysdeps/generic/pt-barrierattr-init.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_barrierattr_init.  Generic 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>
-
-int
-pthread_barrierattr_init (pthread_barrierattr_t *attr)
-{
-  *attr = __pthread_default_barrierattr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c b/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c
deleted file mode 100644
index 84ef2df8..00000000
--- a/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* pthread_barrierattr_setpshared.  Generic 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>
-
-int
-pthread_barrierattr_setpshared (pthread_barrierattr_t *attr,
-				int pshared)
-{
-  switch (pshared)
-    {
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->pshared = pshared;
-      return 0;
-
-    case PTHREAD_PROCESS_SHARED:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-brdcast.c b/libpthread/sysdeps/generic/pt-cond-brdcast.c
deleted file mode 100644
index 3f55e33e..00000000
--- a/libpthread/sysdeps/generic/pt-cond-brdcast.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Broadcast a condition.  Generic version.
-   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.  */
-
-#include <pthread.h>
-
-#include <pt-internal.h>
-
-/* Unblock all threads that are blocked on condition variable COND.  */
-int
-pthread_cond_broadcast (pthread_cond_t *cond)
-{
-  struct __pthread *wakeup;
-
-  __pthread_spin_lock (&cond->__lock);
-
-  wakeup = cond->__queue;
-  cond->__queue = NULL;
-  __pthread_spin_unlock (&cond->__lock);
-
-  /* We can safely walk the list of waiting threads without holding
-     the lock since it is now decoupled from the condition.  */
-  __pthread_dequeuing_iterate (wakeup, wakeup)
-    __pthread_wakeup (wakeup);
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-destroy.c b/libpthread/sysdeps/generic/pt-cond-destroy.c
deleted file mode 100644
index eba47784..00000000
--- a/libpthread/sysdeps/generic/pt-cond-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_cond_destroy.  Generic 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>
-
-int
-pthread_cond_destroy (pthread_cond_t *cond)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-init.c b/libpthread/sysdeps/generic/pt-cond-init.c
deleted file mode 100644
index b9e9fb7a..00000000
--- a/libpthread/sysdeps/generic/pt-cond-init.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* pthread_cond_init.  Generic 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 <assert.h>
-#include <string.h>
-
-#include <pt-internal.h>
-
-int
-pthread_cond_init (pthread_cond_t *cond,
-		   const pthread_condattr_t *attr)
-{
-  *cond = (pthread_cond_t) __PTHREAD_COND_INITIALIZER;
-
-  if (! attr
-      || memcmp (attr, &__pthread_default_condattr, sizeof (*attr) == 0))
-    /* Use the default attributes.  */
-    return 0;
-
-  /* Non-default attributes.  */
-
-  cond->__attr = malloc (sizeof *attr);
-  if (! cond->__attr)
-    return ENOMEM;
-
-  *cond->__attr = *attr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-signal.c b/libpthread/sysdeps/generic/pt-cond-signal.c
deleted file mode 100644
index c5e1bc1d..00000000
--- a/libpthread/sysdeps/generic/pt-cond-signal.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Signal a condition.  Generic 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 <pthread.h>
-
-#include <pt-internal.h>
-
-static int
-cond_signal (struct __pthread_cond *cond, int *unblocked)
-{
-  struct __pthread *wakeup;
-  
-  __pthread_spin_lock (&cond->__lock);
-  wakeup = cond->__queue;
-  if (wakeup)
-    __pthread_dequeue (wakeup);
-  __pthread_spin_unlock (&cond->__lock);
-
-  if (wakeup)
-    {
-      /* We found a thread waiting for the condition to be signalled.
-         Wake it up!  */
-      __pthread_wakeup (wakeup);
-      *unblocked = 1;
-    }
-
-  return 0;
-}
-
-/* Unblock at least one of the threads that are blocked on condition
-   variable COND.  */
-int
-pthread_cond_signal (pthread_cond_t *cond)
-{
-  int unblocked = 0;
-
-  return cond_signal (cond, &unblocked);
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-timedwait.c b/libpthread/sysdeps/generic/pt-cond-timedwait.c
deleted file mode 100644
index c10bdb30..00000000
--- a/libpthread/sysdeps/generic/pt-cond-timedwait.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Wait on a condition.  Generic version.
-   Copyright (C) 2000, 2002, 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 <pthread.h>
-
-#include <pt-internal.h>
-
-extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
-					      pthread_mutex_t *mutex,
-					      const struct timespec *abstime);
-
-int
-pthread_cond_timedwait (pthread_cond_t *cond,
-			pthread_mutex_t *mutex,
-			const struct timespec *abstime)
-{
-  return __pthread_cond_timedwait_internal (cond, mutex, abstime);
-}
-
-/* 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
-   calling thread.  */
-int
-__pthread_cond_timedwait_internal (pthread_cond_t *cond,
-				   pthread_mutex_t *mutex,
-				   const struct timespec *abstime)
-{
-  error_t err;
-  int canceltype;
-
-  void cleanup (void *arg)
-    {
-      struct __pthread *self = _pthread_self ();
-
-      __pthread_spin_lock (&cond->__lock);
-      if (self->prevp)
-	__pthread_dequeue (self);
-      __pthread_spin_unlock (&cond->__lock);
-
-      pthread_setcanceltype (canceltype, &canceltype);
-      __pthread_mutex_lock (mutex);
-    }
-
-  if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
-    return EINVAL;
-
-  struct __pthread *self = _pthread_self ();
-
-  /* Add ourselves to the list of waiters.  */
-  __pthread_spin_lock (&cond->__lock);
-  __pthread_enqueue (&cond->__queue, self);
-  __pthread_spin_unlock (&cond->__lock);
-
-  __pthread_mutex_unlock (mutex);
-
-  /* Enter async cancelation mode.  If cancelation is disabled, then
-     this does not change anything which is exactly what we want.  */
-  pthread_cleanup_push (cleanup, 0);
-  pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &canceltype);
-
-  if (abstime)
-    {
-      err = __pthread_timedblock (self, abstime);
-      if (err)
-	/* We timed out.  We may need to disconnect ourself from the
-	   waiter queue.
-
-	   FIXME: What do we do if we get a wakeup message before we
-	   disconnect ourself?  It may remain until the next time we
-	   block.  */
-	{
-	  assert (err == ETIMEDOUT);
-
-	  __pthread_spin_lock (&mutex->__lock);
-	  if (self->prevp)
-	    __pthread_dequeue (self);
-	  __pthread_spin_unlock (&mutex->__lock);
-	}
-    }
-  else
-    {
-      err = 0;
-      __pthread_block (self);
-    }
-
-  pthread_cleanup_pop (1);
-
-  return err;
-}
diff --git a/libpthread/sysdeps/generic/pt-cond-wait.c b/libpthread/sysdeps/generic/pt-cond-wait.c
deleted file mode 100644
index a03476df..00000000
--- a/libpthread/sysdeps/generic/pt-cond-wait.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Wait on a condition.  Generic 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 <pthread.h>
-
-#include <pt-internal.h>
-
-/* Implemented in pt-cond-timedwait.c.  */
-extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
-					      pthread_mutex_t *mutex,
-					      const struct timespec *abstime);
-
-
-/* Block on condition variable COND.  MUTEX should be held by the
-   calling thread.  On return, MUTEX will be held by the calling
-   thread.  */
-int
-pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-  return __pthread_cond_timedwait_internal (cond, mutex, 0);
-}
diff --git a/libpthread/sysdeps/generic/pt-cond.c b/libpthread/sysdeps/generic/pt-cond.c
deleted file mode 100644
index 033e767f..00000000
--- a/libpthread/sysdeps/generic/pt-cond.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Default condition attributes.  Generic 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 <time.h>
-
-#include <pt-internal.h>
-
-const struct __pthread_condattr __pthread_default_condattr =
-{
-  pshared: PTHREAD_PROCESS_PRIVATE,
-  clock: CLOCK_REALTIME
-};
diff --git a/libpthread/sysdeps/generic/pt-condattr-destroy.c b/libpthread/sysdeps/generic/pt-condattr-destroy.c
deleted file mode 100644
index c8fd71b9..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_condattr_destroy.  Generic 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>
-
-int
-pthread_condattr_destroy (pthread_condattr_t *cond)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-condattr-getclock.c b/libpthread/sysdeps/generic/pt-condattr-getclock.c
deleted file mode 100644
index 5b9f8893..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-getclock.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* pthread_condattr_getclock.  Generic 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 <time.h>
-
-#include <pt-internal.h>
-
-int
-pthread_condattr_getclock (const pthread_condattr_t *attr,
-			   clockid_t *clock)
-{
-  *clock = attr->clock;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-condattr-getpshared.c b/libpthread/sysdeps/generic/pt-condattr-getpshared.c
deleted file mode 100644
index c072a507..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-getpshared.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_condattr_getpshared.  Generic 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>
-
-int
-pthread_condattr_getpshared (const pthread_condattr_t *attr,
-			     int *pshared)
-{
-  *pshared = attr->pshared;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-condattr-init.c b/libpthread/sysdeps/generic/pt-condattr-init.c
deleted file mode 100644
index cf9e1989..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-init.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_condattr_init.  Generic 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>
-
-int
-pthread_condattr_init (pthread_condattr_t *attr)
-{
-  *attr = __pthread_default_condattr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-condattr-setclock.c b/libpthread/sysdeps/generic/pt-condattr-setclock.c
deleted file mode 100644
index 984c17e2..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-setclock.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* pthread_condattr_setclock.  Generic 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>
-
-int
-pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
-{
-  if (__pthread_default_condattr.clock == clock)
-    {
-      attr->clock = clock;
-      return 0;
-    }
-
-  return EINVAL;
-}
diff --git a/libpthread/sysdeps/generic/pt-condattr-setpshared.c b/libpthread/sysdeps/generic/pt-condattr-setpshared.c
deleted file mode 100644
index b9f0af83..00000000
--- a/libpthread/sysdeps/generic/pt-condattr-setpshared.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* pthread_condattr_setpshared.  Generic 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>
-
-int
-pthread_condattr_setpshared (pthread_condattr_t *attr,
-			     int pshared)
-{
-  switch (pshared)
-    {
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->pshared = pshared;
-      return 0;
-
-    case PTHREAD_PROCESS_SHARED:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-destroy-specific.c b/libpthread/sysdeps/generic/pt-destroy-specific.c
deleted file mode 100644
index b627f872..00000000
--- a/libpthread/sysdeps/generic/pt-destroy-specific.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* __pthread_destory_specific.  Generic 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_destory_specifc (struct __pthread *thread)
-{
-  /* Not support, thus there cannot be any.  */
-  return;
-}
diff --git a/libpthread/sysdeps/generic/pt-equal.c b/libpthread/sysdeps/generic/pt-equal.c
deleted file mode 100644
index 8fbc519c..00000000
--- a/libpthread/sysdeps/generic/pt-equal.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Default attributes.  Generic 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 <pthread.h>
-#include <pt-internal.h>
-
-/* Return true if __T1 and __T2 both name the same thread.  Otherwise,
-   false.  */
-int
-pthread_equal (pthread_t __t1, pthread_t __t2)
-{
-  return __t1 == __t2;
-}
diff --git a/libpthread/sysdeps/generic/pt-getconcurrency.c b/libpthread/sysdeps/generic/pt-getconcurrency.c
deleted file mode 100644
index b55c8eef..00000000
--- a/libpthread/sysdeps/generic/pt-getconcurrency.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Get the current level of desired concurrency.  Generic 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>
-
-int
-pthread_getconcurrency (void)
-{
-  return __pthread_concurrency;
-}
diff --git a/libpthread/sysdeps/generic/pt-getcpuclockid.c b/libpthread/sysdeps/generic/pt-getcpuclockid.c
deleted file mode 100644
index 81f6aabd..00000000
--- a/libpthread/sysdeps/generic/pt-getcpuclockid.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Return a thread's cpu clockid.  Generic 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 <time.h>
-
-#include <pt-internal.h>
-
-int
-pthread_getcpuclockid (pthread_t thread, clockid_t *clock)
-{
-#ifdef CLOCK_THREAD_CPUTIME_ID
-  *clock = CLOCK_THREAD_CPUTIME_ID;
-  return 0;
-#else
-  return ENOSYS;
-#endif
-}
diff --git a/libpthread/sysdeps/generic/pt-getschedparam.c b/libpthread/sysdeps/generic/pt-getschedparam.c
deleted file mode 100644
index c128d02e..00000000
--- a/libpthread/sysdeps/generic/pt-getschedparam.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Get the scheduling parameters for a thread.  Generic 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>
-
-int
-pthread_getschedparam (pthread_t thread, int *policy,
-		       struct sched_param *param)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-getspecific.c b/libpthread/sysdeps/generic/pt-getspecific.c
deleted file mode 100644
index 2a7c4a9e..00000000
--- a/libpthread/sysdeps/generic/pt-getspecific.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_getspecific.  Generic 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>
-
-int
-pthread_getspecific (pthread_key_t key)
-{
-  return EINVAL;
-}
diff --git a/libpthread/sysdeps/generic/pt-init-specific.c b/libpthread/sysdeps/generic/pt-init-specific.c
deleted file mode 100644
index 00744fb6..00000000
--- a/libpthread/sysdeps/generic/pt-init-specific.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* __pthread_init_specific.  Generic 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>
-
-error_t
-__pthread_init_specific (struct __pthread *thread)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-key-create.c b/libpthread/sysdeps/generic/pt-key-create.c
deleted file mode 100644
index 7ef4b991..00000000
--- a/libpthread/sysdeps/generic/pt-key-create.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_key_create.  Generic 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>
-
-int
-pthread_key_create (pthread_key_t *key, void (*destructor) (void *))
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-key-delete.c b/libpthread/sysdeps/generic/pt-key-delete.c
deleted file mode 100644
index 6c86f8e2..00000000
--- a/libpthread/sysdeps/generic/pt-key-delete.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_key_delete.  Generic 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>
-
-int
-pthread_key_delete (pthread_key_t key)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-key.h b/libpthread/sysdeps/generic/pt-key.h
deleted file mode 100644
index 544eb20f..00000000
--- a/libpthread/sysdeps/generic/pt-key.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* pthread_key internal declatations.  Generic 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>
-
-#define PTHREAD_KEY_MEMBERS
diff --git a/libpthread/sysdeps/generic/pt-kill.c b/libpthread/sysdeps/generic/pt-kill.c
deleted file mode 100644
index 0dfac344..00000000
--- a/libpthread/sysdeps/generic/pt-kill.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* pthread-kill.c - Generic pthread-kill 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 "sig-internal.h"
-
-int
-pthread_kill (pthread_t tid, int signo)
-{
-  siginfo_t si;
-  memset (&si, 0, sizeof (si));
-  si.si_signo = signo;
-
-  return pthread_kill_siginfo_np (tid, si);
-}
-
diff --git a/libpthread/sysdeps/generic/pt-mutex-destroy.c b/libpthread/sysdeps/generic/pt-mutex-destroy.c
deleted file mode 100644
index 3bbc73fe..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-destroy.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Destroy a mutex.  Generic version.
-   Copyright (C) 2000, 2002, 2006 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 <stdlib.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-_pthread_mutex_destroy (pthread_mutex_t *mutex)
-{
-  if (mutex->attr == __PTHREAD_ERRORCHECK_MUTEXATTR
-   || mutex->attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    /* Static attributes.  */
-    ;
-  else
-    free (mutex->attr);
-
-  return 0;
-}
-
-strong_alias (_pthread_mutex_destroy, pthread_mutex_destroy);
diff --git a/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c b/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c
deleted file mode 100644
index eb51639b..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Get a mutex' priority ceiling.  Generic 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>
-
-int
-pthread_mutex_getprioceiling (const pthread_mutex_t *mutex,
-			      int *prioceiling)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutex-init.c b/libpthread/sysdeps/generic/pt-mutex-init.c
deleted file mode 100644
index 2f960286..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-init.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Initialize a mutex.  Generic version.
-   Copyright (C) 2000, 2002, 2005, 2006, 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 <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-_pthread_mutex_init (pthread_mutex_t *mutex,
-		     const pthread_mutexattr_t *attr)
-{
-  *mutex = (pthread_mutex_t) __PTHREAD_MUTEX_INITIALIZER;
-
-  if (! attr
-      || memcmp (attr, &__pthread_default_mutexattr, sizeof (*attr) == 0))
-    /* The default attributes.  */
-    return 0;
-
-  if (! mutex->attr
-      || mutex->attr == __PTHREAD_ERRORCHECK_MUTEXATTR
-      || mutex->attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    mutex->attr = malloc (sizeof *attr);
-
-  if (! mutex->attr)
-    return ENOMEM;
-
-  *mutex->attr = *attr;
-  return 0;
-}
-
-strong_alias (_pthread_mutex_init, pthread_mutex_init);
diff --git a/libpthread/sysdeps/generic/pt-mutex-lock.c b/libpthread/sysdeps/generic/pt-mutex-lock.c
deleted file mode 100644
index 528e593f..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-lock.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Lock a mutex.  Generic version.
-   Copyright (C) 2000, 2002, 2006 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 <pt-internal.h>
-
-/* Implemented in pt-mutex-timedlock.c.  */
-extern int __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
-					       const struct timespec *abstime);
-
-/* Lock MUTEX, block if we can't get it.  */
-int
-__pthread_mutex_lock (struct __pthread_mutex *mutex)
-{
-  return __pthread_mutex_timedlock_internal (mutex, 0);
-}
-
-strong_alias (__pthread_mutex_lock, _pthread_mutex_lock);
-strong_alias (__pthread_mutex_lock, pthread_mutex_lock);
diff --git a/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c b/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c
deleted file mode 100644
index 9fa8e50d..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Set a mutex' priority ceiling.  Generic 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>
-
-int
-pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prio,
-			      int *oldprio)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutex-timedlock.c b/libpthread/sysdeps/generic/pt-mutex-timedlock.c
deleted file mode 100644
index 883e50af..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-timedlock.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Lock a mutex with a timeout.  Generic version.
-   Copyright (C) 2000, 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 <pt-internal.h>
-
-#define LOSE do { * (int *) 0 = 0; } while (1)
-
-/* Try to lock MUTEX, block until *ABSTIME if it is already held.  As
-   a GNU extension, if TIMESPEC is NULL then wait forever.  */
-int
-__pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
-				    const struct timespec *abstime)
-{
-  struct __pthread *self;
-  const struct __pthread_mutexattr *attr = mutex->attr;
-
-  if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
-    attr = &__pthread_errorcheck_mutexattr;
-  if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    attr = &__pthread_recursive_mutexattr;
-
-  __pthread_spin_lock (&mutex->__lock);
-  if (__pthread_spin_trylock (&mutex->__held) == 0)
-    /* Successfully acquired the lock.  */
-    {
-#ifdef ALWAYS_TRACK_MUTEX_OWNER
-#ifndef NDEBUG
-      self = _pthread_self ();
-      if (self)
-	/* The main thread may take a lock before the library is fully
-	   initialized, in particular, before the main thread has a
-	   TCB.  */
-	{
-	  assert (! mutex->owner);
-	  mutex->owner = _pthread_self ();
-	}
-#endif
-#endif
-
-      if (attr)
-	switch (attr->mutex_type)
-	  {
-	  case PTHREAD_MUTEX_NORMAL:
-	    break;
-
-	  case PTHREAD_MUTEX_RECURSIVE:
-	    mutex->locks = 1;
-	  case PTHREAD_MUTEX_ERRORCHECK:
-	    mutex->owner = _pthread_self ();
-	    break;
-
-	  default:
-	    LOSE;
-	  }
-
-      __pthread_spin_unlock (&mutex->__lock);
-      return 0;
-    }
-
-  /* The lock is busy.  */
-
-  self = _pthread_self ();
-  assert (self);
-
-  if (! attr || attr->mutex_type == PTHREAD_MUTEX_NORMAL)
-    {
-#if defined(ALWAYS_TRACK_MUTEX_OWNER)
-      assert (mutex->owner != self);
-#endif
-    }
-  else
-    {
-      switch (attr->mutex_type)
-	{
-	case PTHREAD_MUTEX_ERRORCHECK:
-	  if (mutex->owner == self)
-	    {
-	      __pthread_spin_unlock (&mutex->__lock);
-	      return EDEADLK;
-	    }
-	  break;
-
-	case PTHREAD_MUTEX_RECURSIVE:
-	  if (mutex->owner == self)
-	    {
-	      mutex->locks ++;
-	      __pthread_spin_unlock (&mutex->__lock);
-	      return 0;
-	    }
-	  break;
-
-	default:
-	  LOSE;
-	}
-    }
-
-#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-  if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-#endif
-    assert (mutex->owner);
-
-  if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
-    return EINVAL;
-
-  /* Add ourselves to the queue.  */
-  __pthread_enqueue (&mutex->__queue, self);
-  __pthread_spin_unlock (&mutex->__lock);
-
-  /* Block the thread.  */
-  if (abstime)
-    {
-      error_t err;
-
-      err = __pthread_timedblock (self, abstime);
-      if (err)
-	/* We timed out.  We may need to disconnect ourself from the
-	   waiter queue.
-
-	   FIXME: What do we do if we get a wakeup message before we
-	   disconnect ourself?  It may remain until the next time we
-	   block.  */
-	{
-	  assert (err == ETIMEDOUT);
-
-	  __pthread_spin_lock (&mutex->__lock);
-	  if (self->prevp)
-	    __pthread_dequeue (self);
-	  __pthread_spin_unlock (&mutex->__lock);
-
-	  return err;
-	}
-    }
-  else
-    __pthread_block (self);
-
-#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-  if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-#endif
-    {
-      assert (mutex->owner == self);
-    }
-
-  if (attr)
-    switch (attr->mutex_type)
-      {
-      case PTHREAD_MUTEX_NORMAL:
-	break;
-
-      case PTHREAD_MUTEX_RECURSIVE:
-	assert (mutex->locks == 0);
-	mutex->locks = 1;
-      case PTHREAD_MUTEX_ERRORCHECK:
-	mutex->owner = self;
-	break;
-
-      default:
-	LOSE;
-      }
-
-  return 0;
-}
-
-int
-pthread_mutex_timedlock (struct __pthread_mutex *mutex,
-			 const struct timespec *abstime)
-{
-  return __pthread_mutex_timedlock_internal (mutex, abstime);
-}
diff --git a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c b/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
deleted file mode 100644
index 967f1c7c..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Transfer ownership of a mutex.  Generic version.
-   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 <pthread.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-__pthread_mutex_transfer_np (struct __pthread_mutex *mutex, pthread_t tid)
-{
-  assert (mutex->owner == _pthread_self ());
-
-  struct __pthread *thread = __pthread_getid (tid);
-  const struct __pthread_mutexattr *attr = mutex->attr;
-
-  if (! thread)
-    return ESRCH;
-
-  if (thread == _pthread_self ())
-    return 0;
-
-  if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
-    attr = &__pthread_errorcheck_mutexattr;
-  if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    attr = &__pthread_recursive_mutexattr;
-
-  if (attr && attr->mutex_type == PTHREAD_MUTEX_ERRORCHECK)
-    {
-
-      if (mutex->owner != _pthread_self ())
-	return EPERM;
-
-      mutex->owner = thread;
-    }
-
-#ifndef NDEBUG
-# if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-  if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-# endif
-    {
-      mutex->owner = thread;
-    }
-#endif
-
-  return 0;
-}
-
-strong_alias (__pthread_mutex_transfer_np, pthread_mutex_transfer_np)
diff --git a/libpthread/sysdeps/generic/pt-mutex-trylock.c b/libpthread/sysdeps/generic/pt-mutex-trylock.c
deleted file mode 100644
index 7a54cc9a..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-trylock.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Try to Lock a mutex.  Generic 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 <pt-internal.h>
-
-#define LOSE do { * (int *) 0 = 0; } while (1)
-
-/* Lock MUTEX, return EBUSY if we can't get it.  */
-int
-__pthread_mutex_trylock (struct __pthread_mutex *mutex)
-{
-  int err;
-  struct __pthread *self;
-  const struct __pthread_mutexattr *attr = mutex->attr;
-
-  if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
-    attr = &__pthread_errorcheck_mutexattr;
-  if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    attr = &__pthread_recursive_mutexattr;
-
-  __pthread_spin_lock (&mutex->__lock);
-  if (__pthread_spin_trylock (&mutex->__held) == 0)
-    /* Acquired the lock.  */
-    {
-#if defined(ALWAYS_TRACK_MUTEX_OWNER)
-#ifndef NDEBUG
-      self = _pthread_self ();
-      if (self)
-	/* The main thread may take a lock before the library is fully
-	   initialized, in particular, before the main thread has a
-	   TCB.  */
-	{
-	  assert (! mutex->owner);
-	  mutex->owner = _pthread_self ();
-	}
-#endif
-#endif
-
-      if (attr)
-	switch (attr->mutex_type)
-	  {
-	  case PTHREAD_MUTEX_NORMAL:
-	    break;
-
-	  case PTHREAD_MUTEX_RECURSIVE:
-	    mutex->locks = 1;
-	  case PTHREAD_MUTEX_ERRORCHECK:
-	    mutex->owner = _pthread_self ();
-	    break;
-
-	  default:
-	    LOSE;
-	  }
-
-      __pthread_spin_unlock (&mutex->__lock);
-      return 0;
-    }
-
-  err = EBUSY;
-
-  if (attr)
-    {
-      self = _pthread_self ();
-      switch (attr->mutex_type)
-	{
-	case PTHREAD_MUTEX_NORMAL:
-	  break;
-
-	case PTHREAD_MUTEX_ERRORCHECK:
-	  /* We could check if MUTEX->OWNER is SELF, however, POSIX
-	     does not permit pthread_mutex_trylock to return EDEADLK
-	     instead of EBUSY, only pthread_mutex_lock.  */
-	  break;
-
-	case PTHREAD_MUTEX_RECURSIVE:
-	  if (mutex->owner == self)
-	    {
-	      mutex->locks ++;
-	      err = 0;
-	    }
-	  break;
-
-	default:
-	  LOSE;
-	}
-    }
-
-  __pthread_spin_unlock (&mutex->__lock);
-
-  return err;
-}
-
-strong_alias (__pthread_mutex_trylock, _pthread_mutex_trylock);
-strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock);
diff --git a/libpthread/sysdeps/generic/pt-mutex-unlock.c b/libpthread/sysdeps/generic/pt-mutex-unlock.c
deleted file mode 100644
index 09d70f8f..00000000
--- a/libpthread/sysdeps/generic/pt-mutex-unlock.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Unlock a mutex.  Generic 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 <pthread.h>
-
-#include <pt-internal.h>
-
-#define LOSE do { * (int *) 0 = 0; } while (1)
-
-/* Unlock MUTEX, rescheduling a waiting thread.  */
-int
-__pthread_mutex_unlock (pthread_mutex_t *mutex)
-{
-  struct __pthread *wakeup;
-  const struct __pthread_mutexattr *attr = mutex->attr;
-
-  if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
-    attr = &__pthread_errorcheck_mutexattr;
-  if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
-    attr = &__pthread_recursive_mutexattr;
-
-  __pthread_spin_lock (&mutex->__lock);
-
-  if (! attr || attr->mutex_type == PTHREAD_MUTEX_NORMAL)
-    {
-#if defined(ALWAYS_TRACK_MUTEX_OWNER)
-# ifndef NDEBUG
-      if (_pthread_self ())
-	{
-	  assert (mutex->owner);
-	  assert (mutex->owner == _pthread_self ());
-	  mutex->owner = NULL;
-	}
-# endif
-#endif
-    }
-  else
-    switch (attr->mutex_type)
-      {
-      case PTHREAD_MUTEX_ERRORCHECK:
-      case PTHREAD_MUTEX_RECURSIVE:
-	if (mutex->owner != _pthread_self ())
-	  {
-	    __pthread_spin_unlock (&mutex->__lock);
-	    return EPERM;
-	  }
-
-	if (attr->mutex_type == PTHREAD_MUTEX_RECURSIVE)
-	  if (--mutex->locks > 0)
-	    {
-	      __pthread_spin_unlock (&mutex->__lock);
-	      return 0;
-	    }
-
-	mutex->owner = 0;
-	break;
-
-      default:
-	LOSE;
-      }
-
-
-  if (mutex->__queue == NULL)
-    {
-      __pthread_spin_unlock (&mutex->__held);
-      __pthread_spin_unlock (&mutex->__lock);
-      return 0;
-    }
-
-  wakeup = mutex->__queue;
-  __pthread_dequeue (wakeup);
-
-#ifndef NDEBUG
-# if !defined (ALWAYS_TRACK_MUTEX_OWNER)
-  if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-# endif
-    {
-      mutex->owner = wakeup;
-    }
-#endif
-
-  /* We do not unlock MUTEX->held: we are transferring the ownership
-     to the thread that we are waking up.  */
-
-  __pthread_spin_unlock (&mutex->__lock);
-  __pthread_wakeup (wakeup);
-
-  return 0;
-}
-
-strong_alias (__pthread_mutex_unlock, _pthread_mutex_unlock);
-strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock);
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-destroy.c b/libpthread/sysdeps/generic/pt-mutexattr-destroy.c
deleted file mode 100644
index fe7e95d2..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_mutexattr_destroy.  Generic 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>
-
-int
-pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c b/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c
deleted file mode 100644
index d03d7192..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_mutexattr_getprioceiling.  Generic 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>
-
-int
-pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
-				  int *prioceiling)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c b/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c
deleted file mode 100644
index d75021a3..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_mutexattr_getprotocol.  Generic 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>
-
-int
-pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr,
-			       int *protocol)
-{
-  *protocol = attr->protocol;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c b/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c
deleted file mode 100644
index 0dad13b8..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_mutexattr_getpshared.  Generic 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>
-
-int
-pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr,
-			      int *pshared)
-{
-  *pshared = attr->pshared;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-gettype.c b/libpthread/sysdeps/generic/pt-mutexattr-gettype.c
deleted file mode 100644
index ff2caea4..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-gettype.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_mutexattr_gettype.  Generic 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>
-
-int
-pthread_mutexattr_gettype (const pthread_mutexattr_t *attr, int *type)
-{
-  *type = attr->mutex_type;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-init.c b/libpthread/sysdeps/generic/pt-mutexattr-init.c
deleted file mode 100644
index 2f23673c..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-init.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_mutexattr_init.  Generic 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>
-
-int
-pthread_mutexattr_init (pthread_mutexattr_t *attr)
-{
-  *attr = __pthread_default_mutexattr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c b/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
deleted file mode 100644
index a9bbd327..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_mutexattr_setprioceiling.  Generic 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>
-
-int
-pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr,
-				  int prioceiling)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c b/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c
deleted file mode 100644
index 9a0d1b1f..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* pthread_mutexattr_setprotocol.  Generic 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>
-
-int
-pthread_mutexattr_setprotocol (pthread_mutexattr_t *attr,
-			       int protocol)
-{
-  if (protocol == __pthread_default_mutexattr.protocol)
-    {
-      attr->protocol = protocol;
-      return 0;
-    }
-
-  switch (protocol)
-    {
-    case PTHREAD_PRIO_NONE:
-    case PTHREAD_PRIO_INHERIT:
-    case PTHREAD_PRIO_PROTECT:
-      return ENOTSUP;
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c b/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c
deleted file mode 100644
index bcbc4d91..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* pthread_mutexattr_setpshared.  Generic 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>
-
-int
-pthread_mutexattr_setpshared (pthread_mutexattr_t *attr,
-			      int pshared)
-{
-  switch (pshared)
-    {
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->pshared = pshared;
-      return 0;
-
-    case PTHREAD_PROCESS_SHARED:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr-settype.c b/libpthread/sysdeps/generic/pt-mutexattr-settype.c
deleted file mode 100644
index e7ae213a..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr-settype.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* pthread_mutexattr_settype.  Generic 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>
-
-int
-pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
-{
-  switch (type)
-    {
-    case PTHREAD_MUTEX_NORMAL:
-    case PTHREAD_MUTEX_ERRORCHECK:
-    case PTHREAD_MUTEX_RECURSIVE:
-      attr->mutex_type = type;
-      return 0;
-
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-mutexattr.c b/libpthread/sysdeps/generic/pt-mutexattr.c
deleted file mode 100644
index 5ebde6ea..00000000
--- a/libpthread/sysdeps/generic/pt-mutexattr.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Default mutex attributes.  Generic 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 <pthread.h>
-#include <pt-internal.h>
-
-const struct __pthread_mutexattr __pthread_default_mutexattr =
-{
-  prioceiling: 0,
-  protocol: PTHREAD_PRIO_NONE,
-  pshared: PTHREAD_PROCESS_PRIVATE,
-  mutex_type: PTHREAD_MUTEX_DEFAULT
-};
-
-const struct __pthread_mutexattr __pthread_errorcheck_mutexattr =
-{
-  prioceiling: 0,
-  protocol: PTHREAD_PRIO_NONE,
-  pshared: PTHREAD_PROCESS_PRIVATE,
-  mutex_type: PTHREAD_MUTEX_ERRORCHECK
-};
-
-const struct __pthread_mutexattr __pthread_recursive_mutexattr =
-{
-  prioceiling: 0,
-  protocol: PTHREAD_PRIO_NONE,
-  pshared: PTHREAD_PROCESS_PRIVATE,
-  mutex_type: PTHREAD_MUTEX_RECURSIVE
-};
diff --git a/libpthread/sysdeps/generic/pt-once.c b/libpthread/sysdeps/generic/pt-once.c
deleted file mode 100644
index 5be5e484..00000000
--- a/libpthread/sysdeps/generic/pt-once.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* pthread_once.  Generic 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 <bits/memory.h>
-
-#include <pt-internal.h>
-
-int
-pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
-{
-  if (once_control->run == 0)
-    {
-      __pthread_spin_lock (&once_control->lock);
-
-      if (once_control->run == 0)
-	{
-	  init_routine ();
-	  __memory_barrier ();
-	  once_control->run = 1;
-	}
-
-      __pthread_spin_unlock (&once_control->lock);
-    }
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-attr.c b/libpthread/sysdeps/generic/pt-rwlock-attr.c
deleted file mode 100644
index 1587feef..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-attr.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Default rwlock attributes.  Generic 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>
-
-const struct __pthread_rwlockattr __pthread_default_rwlockattr =
-{
-  pshared: PTHREAD_PROCESS_PRIVATE
-};
diff --git a/libpthread/sysdeps/generic/pt-rwlock-destroy.c b/libpthread/sysdeps/generic/pt-rwlock-destroy.c
deleted file mode 100644
index 045eebd8..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-destroy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Destroy a rwlock.  Generic version.
-   Copyright (C) 2002, 2006 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>
-
-int
-_pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
-{
-  return 0;
-}
-
-strong_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy);
diff --git a/libpthread/sysdeps/generic/pt-rwlock-init.c b/libpthread/sysdeps/generic/pt-rwlock-init.c
deleted file mode 100644
index c9ff9b28..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-init.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Initialize a rwlock.  Generic version.
-   Copyright (C) 2002, 2005, 2006 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 <string.h>
-#include <pt-internal.h>
-
-int
-_pthread_rwlock_init (pthread_rwlock_t *rwlock,
-		      const pthread_rwlockattr_t *attr)
-{
-  *rwlock = (pthread_rwlock_t) __PTHREAD_RWLOCK_INITIALIZER;
-
-  if (! attr
-      || memcmp (attr, &__pthread_default_rwlockattr, sizeof (*attr) == 0))
-    /* Use the default attributes.  */
-    return 0;
-
-  /* Non-default attributes.  */
-
-  rwlock->__attr = malloc (sizeof *attr);
-  if (! rwlock->__attr)
-    return ENOMEM;
-
-  *rwlock->__attr = *attr;
-  return 0;
-}
-
-strong_alias (_pthread_rwlock_init, pthread_rwlock_init);
diff --git a/libpthread/sysdeps/generic/pt-rwlock-rdlock.c b/libpthread/sysdeps/generic/pt-rwlock-rdlock.c
deleted file mode 100644
index 480cf489..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-rdlock.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Acquire a rwlock for reading.  Generic version.
-   Copyright (C) 2002, 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 <pthread.h>
-#include <pt-internal.h>
-
-/* Implemented in pt-rwlock-timedrdlock.c.  */
-extern int __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
-						  const struct timespec *abstime);
-
-/* Acquire RWLOCK for reading, block if we can't get it.  */
-int
-pthread_rwlock_rdlock (struct __pthread_rwlock *rwlock)
-{
-  return __pthread_rwlock_timedrdlock_internal (rwlock, 0);
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c b/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c
deleted file mode 100644
index ba610fa5..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Acquire a rwlock for reading.  Generic version.
-   Copyright (C) 2002, 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 <pthread.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-/* Acquire the rwlock *RWLOCK for reading blocking until *ABSTIME if
-   it is already held.  As a GNU extension, if TIMESPEC is NULL then
-   wait forever.  */
-int
-__pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
-				       const struct timespec *abstime)
-{
-  struct __pthread *self;
-
-  __pthread_spin_lock (&rwlock->__lock);
-  if (__pthread_spin_trylock (&rwlock->__held) == 0)
-    /* Successfully acquired the lock.  */
-    {
-      assert (rwlock->readerqueue == 0);
-      assert (rwlock->writerqueue == 0);
-      assert (rwlock->readers == 0);
-
-      rwlock->readers = 1;
-      __pthread_spin_unlock (&rwlock->__lock);
-      return 0;
-    }
-  else
-    /* Lock is held, but is held by a reader?  */
-    if (rwlock->readers > 0)
-      /* Just add ourself to number of readers.  */
-      {
-	assert (rwlock->readerqueue == 0);
-	rwlock->readers ++;
-	__pthread_spin_unlock (&rwlock->__lock);
-	return 0;
-      }
-
-  /* The lock is busy.  */
-
-  /* Better be blocked by a writer.  */
-  assert (rwlock->readers == 0);
-
-  if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
-    return EINVAL;
-
-  self = _pthread_self ();
-
-  /* Add ourself to the queue.  */
-  __pthread_enqueue (&rwlock->readerqueue, self);
-  __pthread_spin_unlock (&rwlock->__lock);
-
-  /* Block the thread.  */
-  if (abstime)
-    {
-      error_t err;
-
-      err = __pthread_timedblock (self, abstime);
-      if (err)
-	/* We timed out.  We may need to disconnect ourself from the
-	   waiter queue.
-
-	   FIXME: What do we do if we get a wakeup message before we
-	   disconnect ourself?  It may remain until the next time we
-	   block.  */
-	{
-	  assert (err == ETIMEDOUT);
-
-	  __pthread_spin_lock (&rwlock->__lock);
-	  if (self->prevp)
-	    /* Disconnect ourself.  */
-	    __pthread_dequeue (self);
-	  __pthread_spin_unlock (&rwlock->__lock);
-
-	  return err;
-	}
-    }
-  else
-    __pthread_block (self);
-
-
-  /* The reader count has already been increment by whoever woke us
-     up.  */
-
-  assert (rwlock->readers > 0);
-
-  return 0;
-}
-
-int
-pthread_rwlock_timedrdlock (struct __pthread_rwlock *rwlock,
-			    const struct timespec *abstime)
-{
-  return __pthread_rwlock_timedrdlock_internal (rwlock, abstime);
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c b/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c
deleted file mode 100644
index 04eab51f..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Acquire a rwlock for writing.  Generic version.
-   Copyright (C) 2002, 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 <pthread.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-/* Acquire RWLOCK for writing blocking until *ABSTIME if we cannot get
-   it.  As a special GNU extension, if ABSTIME is NULL then the wait
-   shall not time out.  */
-int
-__pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
-				       const struct timespec *abstime)
-{
-  struct __pthread *self;
-
-  __pthread_spin_lock (&rwlock->__lock);
-  if (__pthread_spin_trylock (&rwlock->__held) == 0)
-    /* Successfully acquired the lock.  */
-    {
-      assert (rwlock->readerqueue == 0);
-      assert (rwlock->writerqueue == 0);
-      assert (rwlock->readers == 0);
-
-      __pthread_spin_unlock (&rwlock->__lock);
-      return 0;
-    }
-
-  /* The lock is busy.  */
-
-  if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
-    return EINVAL;
-
-  self = _pthread_self ();
-
-  /* Add ourselves to the queue.  */
-  __pthread_enqueue (&rwlock->writerqueue, self);
-  __pthread_spin_unlock (&rwlock->__lock);
-
-  /* Block the thread.  */
-  if (abstime)
-    {
-      error_t err;
-
-      err = __pthread_timedblock (self, abstime);
-      if (err)
-	/* We timed out.  We may need to disconnect ourself from the
-	   waiter queue.
-
-	   FIXME: What do we do if we get a wakeup message before we
-	   disconnect ourself?  It may remain until the next time we
-	   block.  */
-	{
-	  assert (err == ETIMEDOUT);
-
-	  __pthread_spin_lock (&rwlock->__lock);
-	  if (self->prevp)
-	    /* Disconnect ourself.  */
-	    __pthread_dequeue (self);
-	  __pthread_spin_unlock (&rwlock->__lock);
-
-	  return err;
-	}
-    }
-  else
-    __pthread_block (self);
-
-  assert (rwlock->readers == 0);
-
-  return 0;
-}
-
-int
-pthread_rwlock_timedwrlock (struct __pthread_rwlock *rwlock,
-			    const struct timespec *abstime)
-{
-  return __pthread_rwlock_timedwrlock_internal (rwlock, abstime);
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c b/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c
deleted file mode 100644
index 2419efb1..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Try to acquire a rwlock for reading.  Generic 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 <assert.h>
-
-#include <pt-internal.h>
-
-/* Try to acquire RWLOCK.  */
-int
-pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock)
-{
-  __pthread_spin_lock (&rwlock->__lock);
-  if (__pthread_spin_trylock (&rwlock->__held) == 0)
-    /* Successfully acquired the lock.  */
-    {
-      assert (rwlock->readerqueue == 0);
-      assert (rwlock->writerqueue == 0);
-      assert (rwlock->readers == 0);
-
-      rwlock->readers = 1;
-      __pthread_spin_unlock (&rwlock->__lock);
-      return 0;
-    }
-  else
-    /* Lock is held, but is held by a reader?  */
-    if (rwlock->readers > 0)
-      {
-	assert (rwlock->readerqueue == 0);
-	rwlock->readers ++;
-	__pthread_spin_unlock (&rwlock->__lock);
-	return 0;
-      }
-
-  /* The lock is busy.  */
-
-  __pthread_spin_unlock (&rwlock->__lock);
-
-  return EBUSY;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c b/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c
deleted file mode 100644
index 6b9c5b56..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Try to acquire a rwlock for writing.  Generic 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 <assert.h>
-
-#include <pt-internal.h>
-
-/* Try to acquire RWLOCK for writing.  */
-int
-pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock)
-{
-  __pthread_spin_lock (&rwlock->__lock);
-  if (__pthread_spin_trylock (&rwlock->__held) == 0)
-    /* Successfully acquired the lock.  */
-    {
-      assert (rwlock->readerqueue == 0);
-      assert (rwlock->writerqueue == 0);
-      assert (rwlock->readers == 0);
-
-      __pthread_spin_unlock (&rwlock->__lock);
-      return 0;
-    }
-
-  /* The lock is busy.  */
-
-  __pthread_spin_unlock (&rwlock->__lock);
-
-  return EBUSY;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-unlock.c b/libpthread/sysdeps/generic/pt-rwlock-unlock.c
deleted file mode 100644
index fb23a0b9..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-unlock.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Unlock a rwlock.  Generic 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 <pthread.h>
-
-#include <pt-internal.h>
-
-/* Unlock *RWLOCK, rescheduling a waiting writer thread or, if there
-   are no threads waiting for a write lock, rescheduling the reader
-   threads.  */
-int
-pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
-{
-  struct __pthread *wakeup;
-  
-  __pthread_spin_lock (&rwlock->__lock);
-
-  assert (__pthread_spin_trylock (&rwlock->__held) == EBUSY);
-
-  if (rwlock->readers > 1)
-    /* There are other readers.  */
-    {
-      rwlock->readers --;
-      __pthread_spin_unlock (&rwlock->__lock);
-      return 0;
-    }
-
-  if (rwlock->readers == 1)
-    /* Last reader.  */
-    rwlock->readers = 0;
-      
-
-  /* Wake someone else up.  Try the writer queue first, then the
-     reader queue if that is empty.  */
-
-  if (rwlock->writerqueue)
-    {
-      wakeup = rwlock->writerqueue;
-      __pthread_dequeue (wakeup);
-
-      /* We do not unlock RWLOCK->held: we are transferring the ownership
-	 to the thread that we are waking up.  */
-
-      __pthread_spin_unlock (&rwlock->__lock);
-      __pthread_wakeup (wakeup);
-
-      return 0;
-    }
-
-  if (rwlock->readerqueue)
-    {
-      __pthread_queue_iterate (rwlock->readerqueue, wakeup)
-	rwlock->readers ++;
-
-      wakeup = rwlock->readerqueue;
-      rwlock->readerqueue = 0;
-
-      __pthread_spin_unlock (&rwlock->__lock);
-
-      /* We can safely walk the list of waiting threads without holding
-	 the lock since it is now decoupled from the rwlock.  */
-      __pthread_dequeuing_iterate (wakeup, wakeup)
-	__pthread_wakeup (wakeup);
-
-      return 0;
-    }
-
-
-  /* Noone is waiting.  Just unlock it.  */
-
-  __pthread_spin_unlock (&rwlock->__held);
-  __pthread_spin_unlock (&rwlock->__lock);
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlock-wrlock.c b/libpthread/sysdeps/generic/pt-rwlock-wrlock.c
deleted file mode 100644
index be85b906..00000000
--- a/libpthread/sysdeps/generic/pt-rwlock-wrlock.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Acquire a rwlock for writing.  Generic 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 <assert.h>
-
-#include <pt-internal.h>
-
-/* Implemented in pt-rwlock-timedwrlock.c.  */
-extern int __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
-						  const struct timespec *abstime);
-
-/* Acquire RWLOCK for writing.  */
-int
-pthread_rwlock_wrlock (struct __pthread_rwlock *rwlock)
-{
-  return __pthread_rwlock_timedwrlock_internal (rwlock, 0);
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c b/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c
deleted file mode 100644
index eabfcbe8..00000000
--- a/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_rwlockattr_destroy.  Generic 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>
-
-int
-pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
-{
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c b/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c
deleted file mode 100644
index e8752c0c..00000000
--- a/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* pthread_rwlockattr_getpshared.  Generic 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>
-
-int
-pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr,
-			       int *pshared)
-{
-  *pshared = attr->pshared;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlockattr-init.c b/libpthread/sysdeps/generic/pt-rwlockattr-init.c
deleted file mode 100644
index 34da6bf0..00000000
--- a/libpthread/sysdeps/generic/pt-rwlockattr-init.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pthread_rwlockattr_init.  Generic 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>
-
-int
-pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
-{
-  *attr = __pthread_default_rwlockattr;
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c b/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c
deleted file mode 100644
index a861d034..00000000
--- a/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* pthread_rwlockattr_setpshared.  Generic 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>
-
-int
-pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr,
-			       int pshared)
-{
-  switch (pshared)
-    {
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->pshared = pshared;
-      return 0;
-
-    case PTHREAD_PROCESS_SHARED:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-    }
-}
diff --git a/libpthread/sysdeps/generic/pt-setconcurrency.c b/libpthread/sysdeps/generic/pt-setconcurrency.c
deleted file mode 100644
index cd55b1ba..00000000
--- a/libpthread/sysdeps/generic/pt-setconcurrency.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Set the desired level of concurrency.  Generic 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>
-
-int __pthread_concurrency;
-
-int
-pthread_setconcurrency (int new_level)
-{
-  if (new_level < 0)
-    return EINVAL;
-
-  __pthread_concurrency = new_level;
-
-  return 0;
-}
diff --git a/libpthread/sysdeps/generic/pt-setschedparam.c b/libpthread/sysdeps/generic/pt-setschedparam.c
deleted file mode 100644
index a70b0796..00000000
--- a/libpthread/sysdeps/generic/pt-setschedparam.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Set the scheduling parameters for a thread.  Generic version.
-   Copyright (C) 2002, 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 <pthread.h>
-#include <pt-internal.h>
-
-int
-pthread_setschedparam (pthread_t thread, int policy,
-		       const struct sched_param *param)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-setschedprio.c b/libpthread/sysdeps/generic/pt-setschedprio.c
deleted file mode 100644
index 60668eb1..00000000
--- a/libpthread/sysdeps/generic/pt-setschedprio.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Set the scheduling priority of a thread.  Generic 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>
-
-int
-pthread_setschedprio (pthread_t thread, int prio)
-{
-  return ENOSYS;
-}
diff --git a/libpthread/sysdeps/generic/pt-setspecific.c b/libpthread/sysdeps/generic/pt-setspecific.c
deleted file mode 100644
index d520c5df..00000000
--- a/libpthread/sysdeps/generic/pt-setspecific.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* pthread_setspecific.  Generic 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>
-
-int
-pthread_setspecific (pthread_key_t key, const void *value)
-{
-  return EINVAL;
-}
diff --git a/libpthread/sysdeps/generic/pt-startup.c b/libpthread/sysdeps/generic/pt-startup.c
deleted file mode 100644
index c21a1819..00000000
--- a/libpthread/sysdeps/generic/pt-startup.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Thread initialization.  Generic 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>
-
-void
-__pthread_startup (void)
-{
-}
diff --git a/libpthread/sysdeps/generic/raise.c b/libpthread/sysdeps/generic/raise.c
deleted file mode 100644
index 410f557d..00000000
--- a/libpthread/sysdeps/generic/raise.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* raise.c - Generic raise 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 "sig-internal.h"
-
-int
-raise (int signo)
-{
-  /* According to POSIX, if we implement threads (and we do), then
-     "the effect of the raise() function shall be equivalent to
-     calling: pthread_kill(pthread_self(), sig);"  */
-
-debug (0, "");
-  int err = pthread_kill (pthread_self (), signo);
-debug (0, "");
-  if (err)
-    {
-      errno = err;
-      return -1;
-    }
-
-  return 0;
-}
-
diff --git a/libpthread/sysdeps/generic/sem-close.c b/libpthread/sysdeps/generic/sem-close.c
deleted file mode 100644
index 9f48032f..00000000
--- a/libpthread/sysdeps/generic/sem-close.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Close a named semaphore.  Generic 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_close (sem_t *sem)
-{
-  errno = EOPNOTSUPP;
-  return -1;
-}
-
-strong_alias (__sem_close, sem_close);
diff --git a/libpthread/sysdeps/generic/sem-destroy.c b/libpthread/sysdeps/generic/sem-destroy.c
deleted file mode 100644
index 6486599c..00000000
--- a/libpthread/sysdeps/generic/sem-destroy.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Destroy a semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_destroy (sem_t *sem)
-{
-  if (sem->__queue)
-    /* There are threads waiting on *SEM.  */
-    {
-      errno = EBUSY;
-      return -1;
-    }
-
-  return 0;
-}
-
-strong_alias (__sem_destroy, sem_destroy);
diff --git a/libpthread/sysdeps/generic/sem-getvalue.c b/libpthread/sysdeps/generic/sem-getvalue.c
deleted file mode 100644
index 7762089b..00000000
--- a/libpthread/sysdeps/generic/sem-getvalue.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Get the value of a semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <pt-internal.h>
-
-int
-__sem_getvalue (sem_t *restrict sem, int *restrict value)
-{
-  __pthread_spin_lock (&sem->__lock);
-  *value = sem->__value;
-  __pthread_spin_unlock (&sem->__lock);
-
-  return 0;
-}
-
-strong_alias (__sem_getvalue, sem_getvalue);
diff --git a/libpthread/sysdeps/generic/sem-init.c b/libpthread/sysdeps/generic/sem-init.c
deleted file mode 100644
index d2414f5d..00000000
--- a/libpthread/sysdeps/generic/sem-init.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Initialize a semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_init (sem_t *sem, int pshared, unsigned value)
-{
-  if (pshared != 0)
-    {
-      errno = EOPNOTSUPP;
-      return -1;
-    }
-
-#ifdef SEM_VALUE_MAX
-  if (value > SEM_VALUE_MAX)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-#endif
-
-  *sem = (sem_t) __SEMAPHORE_INITIALIZER (pshared, value);
-  return 0;
-}
-
-strong_alias (__sem_init, sem_init);
diff --git a/libpthread/sysdeps/generic/sem-open.c b/libpthread/sysdeps/generic/sem-open.c
deleted file mode 100644
index bae87ed0..00000000
--- a/libpthread/sysdeps/generic/sem-open.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Open a named semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-sem_t *
-__sem_open (const char *name, int open_flags, ...)
-{
-  errno = EOPNOTSUPP;
-  return SEM_FAILED;
-}
-
-strong_alias (__sem_open, sem_open);
diff --git a/libpthread/sysdeps/generic/sem-post.c b/libpthread/sysdeps/generic/sem-post.c
deleted file mode 100644
index 6d438bf2..00000000
--- a/libpthread/sysdeps/generic/sem-post.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Post a semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-__sem_post (sem_t *sem)
-{
-  struct __pthread *wakeup;
-
-  __pthread_spin_lock (&sem->__lock);
-  if (sem->__value > 0)
-    /* Do a quick up.  */
-    {
-      assert (! sem->__queue);
-      sem->__value ++;
-      __pthread_spin_unlock (&sem->__lock);
-      return 0;
-    }
-
-  if (! sem->__queue)
-    /* No one waiting.  */
-    {
-      sem->__value = 1;
-      __pthread_spin_unlock (&sem->__lock);
-      return 0;
-    }
-
-  /* Wake someone up.  */
-
-  /* First dequeue someone.  */
-  wakeup = sem->__queue;
-  __pthread_dequeue (wakeup);
-
-  /* Then drop the lock and transfer control.  */
-  __pthread_spin_unlock (&sem->__lock);
-
-  __pthread_wakeup (wakeup);
-
-  return 0;
-}
-
-strong_alias (__sem_post, sem_post);
diff --git a/libpthread/sysdeps/generic/sem-timedwait.c b/libpthread/sysdeps/generic/sem-timedwait.c
deleted file mode 100644
index e34539a9..00000000
--- a/libpthread/sysdeps/generic/sem-timedwait.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Wait on a semaphore with a timeout.  Generic version.
-   Copyright (C) 2005, 2006, 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 <semaphore.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <pt-internal.h>
-
-int
-__sem_timedwait_internal (sem_t *restrict sem,
-			  const struct timespec *restrict timeout)
-{
-  struct __pthread *self;
-
-  __pthread_spin_lock (&sem->__lock);
-  if (sem->__value > 0)
-    /* Successful down.  */
-    {
-      sem->__value --;
-      __pthread_spin_unlock (&sem->__lock);
-      return 0;
-    }
-
-  if (timeout && (timeout->tv_nsec < 0 || timeout->tv_nsec >= 1000000000))
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  /* Add ourselves to the queue.  */
-  self = _pthread_self ();
-
-  __pthread_enqueue (&sem->__queue, self);
-  __pthread_spin_unlock (&sem->__lock);
-
-  /* Block the thread.  */
-  if (timeout)
-    {
-      error_t err;
-
-      err = __pthread_timedblock (self, timeout);
-      if (err)
-	/* We timed out.  We may need to disconnect ourself from the
-	   waiter queue.
-
-	   FIXME: What do we do if we get a wakeup message before we
-	   disconnect ourself?  It may remain until the next time we
-	   block.  */
-	{
-	  assert (err == ETIMEDOUT);
-
-	  __pthread_spin_lock (&sem->__lock);
-	  if (self->prevp)
-	    __pthread_dequeue (self);
-	  __pthread_spin_unlock (&sem->__lock);
-
-	  errno = err;
-	  return -1;
-	}
-    }
-  else
-    __pthread_block (self);
-
-  return 0;
-}
-
-int
-__sem_timedwait (sem_t *restrict sem,
-		 const struct timespec *restrict timeout)
-{
-  return __sem_timedwait_internal (sem, timeout);
-}
-
-strong_alias (__sem_timedwait, sem_timedwait);
diff --git a/libpthread/sysdeps/generic/sem-trywait.c b/libpthread/sysdeps/generic/sem-trywait.c
deleted file mode 100644
index 437e2822..00000000
--- a/libpthread/sysdeps/generic/sem-trywait.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Lock a semaphore if it does not require blocking.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_trywait (sem_t *sem)
-{
-  __pthread_spin_lock (&sem->__lock);
-  if (sem->__value > 0)
-    /* Successful down.  */
-    {
-      sem->__value --;
-      __pthread_spin_unlock (&sem->__lock);
-      return 0;
-    }
-  __pthread_spin_unlock (&sem->__lock);
-
-  errno = EAGAIN;
-  return -1;
-}
-
-strong_alias (__sem_trywait, sem_trywait);
diff --git a/libpthread/sysdeps/generic/sem-unlink.c b/libpthread/sysdeps/generic/sem-unlink.c
deleted file mode 100644
index 570ed614..00000000
--- a/libpthread/sysdeps/generic/sem-unlink.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Unlink a named semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_unlink (const char *name)
-{
-  errno = EOPNOTSUPP;
-  return -1;
-}
-
-strong_alias (__sem_unlink, sem_unlink);
diff --git a/libpthread/sysdeps/generic/sem-wait.c b/libpthread/sysdeps/generic/sem-wait.c
deleted file mode 100644
index 8347480c..00000000
--- a/libpthread/sysdeps/generic/sem-wait.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Wait on a semaphore.  Generic version.
-   Copyright (C) 2005, 2006 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 <semaphore.h>
-#include <pt-internal.h>
-
-extern int __sem_timedwait_internal (sem_t *restrict sem,
-				     const struct timespec *restrict timeout);
-
-int
-__sem_wait (sem_t *sem)
-{
-  return __sem_timedwait_internal (sem, 0);
-}
-
-strong_alias (__sem_wait, sem_wait);
diff --git a/libpthread/sysdeps/generic/sigaddset.c b/libpthread/sysdeps/generic/sigaddset.c
deleted file mode 100644
index 14edb71c..00000000
--- a/libpthread/sysdeps/generic/sigaddset.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* sigaddset.c - Generic sigaddset 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 "sig-internal.h"
-
-int
-sigaddset (sigset_t *sigset, int signo)
-{
-  if (signo <= 0 || signo >= NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  *sigset |= sigmask (signo);
-  return 0;
-}
-
diff --git a/libpthread/sysdeps/generic/sigdelset.c b/libpthread/sysdeps/generic/sigdelset.c
deleted file mode 100644
index 5456467f..00000000
--- a/libpthread/sysdeps/generic/sigdelset.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* sigdelset.c - Generic sigdelset 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 "sig-internal.h"
-
-int
-sigdelset (sigset_t *sigset, int signo)
-{
-  if (signo <= 0 || signo >= NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  *sigset &= ~sigmask (signo);
-  return 0;
-}
-
diff --git a/libpthread/sysdeps/generic/sigemptyset.c b/libpthread/sysdeps/generic/sigemptyset.c
deleted file mode 100644
index 690c15b6..00000000
--- a/libpthread/sysdeps/generic/sigemptyset.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* sigemptyset.c - Generic sigemptyset 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 <signal.h>
-
-int
-sigemptyset (sigset_t *sigset)
-{
-  *sigset = 0;
-  return 0;
-}
-
diff --git a/libpthread/sysdeps/generic/sigfillset.c b/libpthread/sysdeps/generic/sigfillset.c
deleted file mode 100644
index f0ac0781..00000000
--- a/libpthread/sysdeps/generic/sigfillset.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* sigfillset.c - Generic sigfillset 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 <signal.h>
-
-int
-sigfillset (sigset_t *sigset)
-{
-  *sigset = (1ULL << (NSIG - 1)) - 1;
-  return 0;
-}
-
diff --git a/libpthread/sysdeps/generic/siginterrupt.c b/libpthread/sysdeps/generic/siginterrupt.c
deleted file mode 100644
index 0899efbb..00000000
--- a/libpthread/sysdeps/generic/siginterrupt.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* siginterrupt.c - Generic siginterrupt 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 "sig-internal.h"
-
-int
-siginterrupt (int sig, int flag)
-{
-  int ret;
-  struct sigaction act;
-
-  sigaction (sig, NULL, &act);
-  if (flag)
-    act.sa_flags &= ~SA_RESTART;
-  else
-    act.sa_flags |= SA_RESTART;
-  ret = sigaction(sig, &act, NULL);
-  return ret;
-}
diff --git a/libpthread/sysdeps/generic/sigismember.c b/libpthread/sysdeps/generic/sigismember.c
deleted file mode 100644
index b3d65c97..00000000
--- a/libpthread/sysdeps/generic/sigismember.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* sigismember.c - Generic sigismember 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 "sig-internal.h"
-
-int
-sigismember (const sigset_t *sigset, int signo)
-{
-  if (signo <= 0 || signo >= NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  if (*sigset & sigmask (signo))
-    return 1;
-  else
-    return 0;
-}
diff --git a/libpthread/sysdeps/generic/signal.c b/libpthread/sysdeps/generic/signal.c
deleted file mode 100644
index 7555d0a1..00000000
--- a/libpthread/sysdeps/generic/signal.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* signal.c - Generic signal 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 "sig-internal.h"
-
-void (*signal (int sig, void (*handler)(int)))(int)
-{
-  struct sigaction sa;
-
-  sa.sa_handler = handler;
-  sa.sa_flags = SA_RESTART;
-
-  if (sigemptyset (&sa.sa_mask) < 0
-      || sigaddset (&sa.sa_mask, sig) < 0)
-    return SIG_ERR;
-
-  struct sigaction osa;
-  if (sigaction (sig, &sa, &osa) < 0)
-    return SIG_ERR;
-
-  return osa.sa_handler;
-}
-
-void (*bsd_signal (int sig, void (*func)(int)))(int)
-{
-  return signal (sig, func);
-}
diff --git a/libpthread/sysdeps/generic/sigwait.c b/libpthread/sysdeps/generic/sigwait.c
deleted file mode 100644
index 7d10bf8b..00000000
--- a/libpthread/sysdeps/generic/sigwait.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* sigwait.c - Generic sigwait 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 "sig-internal.h"
-
-int
-sigwait (const sigset_t *restrict set, int *restrict signo)
-{
-  siginfo_t info;
-
-  if (sigwaitinfo (set, &info) < 0)
-    return -1;
-
-  *signo = info.si_signo;
-  return 0;
-}
-