Move headers from generic/ to pthread/

So that the glibc makerules can find them instead of using the system ones.

* sysdeps/generic/bits/barrier-attr.h: Move to...
* sysdeps/pthread/bits/barrier-attr.: ... here.
* sysdeps/generic/bits/barrier.h: Move to...
* sysdeps/pthread/bits/barrier.: ... here.
* sysdeps/generic/bits/cancelation.h: Move to...
* sysdeps/pthread/bits/cancelation.: ... here.
* sysdeps/generic/bits/condition-attr.h: Move to...
* sysdeps/pthread/bits/condition-attr.: ... here.
* sysdeps/generic/bits/condition.h: Move to...
* sysdeps/pthread/bits/condition.: ... here.
* sysdeps/generic/bits/mutex-attr.h: Move to...
* sysdeps/pthread/bits/mutex-attr.: ... here.
* sysdeps/generic/bits/mutex.h: Move to...
* sysdeps/pthread/bits/mutex.: ... here.
* sysdeps/generic/bits/once.h: Move to...
* sysdeps/pthread/bits/once.: ... here.
* sysdeps/generic/bits/pthread-np.h: Move to...
* sysdeps/pthread/bits/pthread-np.: ... here.
* sysdeps/generic/bits/pthread.h: Move to...
* sysdeps/pthread/bits/pthread.: ... here.
* sysdeps/generic/bits/pthreadtypes.h: Move to...
* sysdeps/pthread/bits/pthreadtypes.: ... here.
* sysdeps/generic/bits/rwlock-attr.h: Move to...
* sysdeps/pthread/bits/rwlock-attr.: ... here.
* sysdeps/generic/bits/rwlock.h: Move to...
* sysdeps/pthread/bits/rwlock.: ... here.
* sysdeps/generic/bits/semaphore.h: Move to...
* sysdeps/pthread/bits/semaphore.: ... here.
* sysdeps/generic/bits/thread-attr.h: Move to...
* sysdeps/pthread/bits/thread-attr.: ... here.
* sysdeps/generic/bits/thread-specific.h: Move to...
* sysdeps/pthread/bits/thread-specific.: ... here.

16 files changed, 0 insertions, 632 deletions

diff --git a/sysdeps/generic/bits/barrier-attr.h b/sysdeps/generic/bits/barrier-attr.h
deleted file mode 100644
index 7734069..0000000
--- a/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/sysdeps/generic/bits/barrier.h b/sysdeps/generic/bits/barrier.h
deleted file mode 100644
index dabe86f..0000000
--- a/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/sysdeps/generic/bits/cancelation.h b/sysdeps/generic/bits/cancelation.h
deleted file mode 100644
index 1ed16c6..0000000
--- a/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/sysdeps/generic/bits/condition-attr.h b/sysdeps/generic/bits/condition-attr.h
deleted file mode 100644
index 19c92bb..0000000
--- a/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/sysdeps/generic/bits/condition.h b/sysdeps/generic/bits/condition.h
deleted file mode 100644
index bf13ada..0000000
--- a/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/sysdeps/generic/bits/mutex-attr.h b/sysdeps/generic/bits/mutex-attr.h
deleted file mode 100644
index f3d0752..0000000
--- a/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/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
deleted file mode 100644
index 3120237..0000000
--- a/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/sysdeps/generic/bits/once.h b/sysdeps/generic/bits/once.h
deleted file mode 100644
index 05895b9..0000000
--- a/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/sysdeps/generic/bits/pthread-np.h b/sysdeps/generic/bits/pthread-np.h
deleted file mode 100644
index d5ddbb0..0000000
--- a/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/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
deleted file mode 100644
index 80e6b09..0000000
--- a/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/sysdeps/generic/bits/pthreadtypes.h b/sysdeps/generic/bits/pthreadtypes.h
deleted file mode 100644
index 70368ff..0000000
--- a/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/pthreadtypes.h>
-
-#endif /* bits/pthreadtypes.h */
diff --git a/sysdeps/generic/bits/rwlock-attr.h b/sysdeps/generic/bits/rwlock-attr.h
deleted file mode 100644
index e78b91e..0000000
--- a/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/sysdeps/generic/bits/rwlock.h b/sysdeps/generic/bits/rwlock.h
deleted file mode 100644
index bc27726..0000000
--- a/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/sysdeps/generic/bits/semaphore.h b/sysdeps/generic/bits/semaphore.h
deleted file mode 100644
index 5e987c1..0000000
--- a/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/sysdeps/generic/bits/thread-attr.h b/sysdeps/generic/bits/thread-attr.h
deleted file mode 100644
index d9456b0..0000000
--- a/sysdeps/generic/bits/thread-attr.h
+++ /dev/null
@@ -1,47 +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>
-
-#define __need_size_t
-#include <stddef.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/sysdeps/generic/bits/thread-specific.h b/sysdeps/generic/bits/thread-specific.h
deleted file mode 100644
index b42d99e..0000000
--- a/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 */