Merge branch 'upstream-merged'

1 files changed, 0 insertions, 43 deletions

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 */