Merge branch 'upstream-merged'

1 files changed, 0 insertions, 38 deletions

diff --git a/libpthread/sysdeps/mach/bits/spin-lock.h b/libpthread/sysdeps/mach/bits/spin-lock.h
deleted file mode 100644
index 537dac9d..00000000
--- a/libpthread/sysdeps/mach/bits/spin-lock.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Definitions of user-visible names for spin locks.
-   Copyright (C) 1994, 1997, 2002, 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _BITS_SPIN_LOCK_H
-#define _BITS_SPIN_LOCK_H	1
-
-#include <features.h>
-#include <machine-lock.h>	/* This does all the work.  */
-
-__BEGIN_DECLS
-
-/* The type of a spin lock object.  */
-typedef __spin_lock_t __pthread_spinlock_t;
-
-/* Initializer for a spin lock object.  */
-#ifndef __PTHREAD_SPIN_LOCK_INITIALIZER
-#error __PTHREAD_SPIN_LOCK_INITIALIZER undefined: should be defined by <lock-intern.h>.
-#endif
-
-__END_DECLS
-
-#endif /* bits/spin-lock.h */