deleted file mode 100644
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_spin_trylock.S"
similarity index 100%
rename from nptl/sysdeps/i386/i486/pthread_spin_trylock.S
rename to sysdeps/i386/i486/nptl/pthread_spin_trylock.S
new file mode 100644
@@ -0,0 +1 @@
+#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
similarity index 100%
rename from nptl/sysdeps/i386/i686/Makefile
rename to sysdeps/i386/i686/nptl/Makefile
similarity index 93%
rename from nptl/sysdeps/i386/i686/pthread_spin_trylock.S
rename to sysdeps/i386/i686/nptl/pthread_spin_trylock.S
@@ -17,4 +17,4 @@
<http://www.gnu.org/licenses/>. */
#define HAVE_CMOV 1
-#include "../i486/pthread_spin_trylock.S"
+#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
similarity index 98%
rename from nptl/sysdeps/i386/i686/tls.h
rename to sysdeps/i386/i686/nptl/tls.h
@@ -30,6 +30,6 @@
/* Get the full set of definitions. */
-#include "../tls.h"
+#include_next <tls.h>
#endif /* tls.h */
similarity index 100%
rename from nptl/sysdeps/i386/Makefile
rename to sysdeps/i386/nptl/Makefile
similarity index 100%
rename from nptl/sysdeps/i386/pthread_spin_init.c
rename to sysdeps/i386/nptl/pthread_spin_init.c
similarity index 100%
rename from nptl/sysdeps/i386/pthread_spin_lock.S
rename to sysdeps/i386/nptl/pthread_spin_lock.S
similarity index 100%
rename from nptl/sysdeps/i386/pthread_spin_unlock.S
rename to sysdeps/i386/nptl/pthread_spin_unlock.S
similarity index 100%
rename from nptl/sysdeps/i386/pthreaddef.h
rename to sysdeps/i386/nptl/pthreaddef.h
similarity index 100%
rename from nptl/sysdeps/i386/tcb-offsets.sym
rename to sysdeps/i386/nptl/tcb-offsets.sym
similarity index 100%
rename from nptl/sysdeps/i386/tls.h
rename to sysdeps/i386/nptl/tls.h
@@ -1 +1 @@
-#include "../i386/pthread_spin_init.c"
+#include <sysdeps/i386/nptl/pthread_spin_init.c>