12 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ce6c4d8f24..d95375372c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2014-06-24  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/i386/i486/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i486/pthread_spin_trylock.S: ... here.
+	* sysdeps/i386/i586/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i586/pthread_spin_trylock.S: ... here.
+	Update #include.
+	* sysdeps/i386/i686/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i686/pthread_spin_trylock.S: ... here.
+	Update #include.
+	* sysdeps/x86_64/64/nptl/shlib-versions: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: ... here.
+	* sysdeps/x86_64/x32/nptl/shlib-versions: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: ... here.
+	* sysdeps/x86/nptl/bits/pthreadtypes.h: Moved ...
+	* sysdeps/x86/bits/pthreadtypes.h: ... here.
+	* sysdeps/x86/nptl/bits/semaphore.h: Moved ...
+	* sysdeps/x86/bits/semaphore.h: ... here.
+	* sysdeps/x86/nptl/elide.h: Moved ...
+	* sysdeps/x86/elide.h: ... here.
+	* sysdeps/x86_64/nptl/Implies: File removed.
+	* sysdeps/i386/nptl/Implies: File removed.
+
 2014-06-24  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #16539]
diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S
index 0bcc0c6ede..0bcc0c6ede 100644
--- a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S
+++ b/sysdeps/i386/i486/pthread_spin_trylock.S
diff --git a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S
deleted file mode 100644
index a0c90b5913..0000000000
--- a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S
new file mode 100644
index 0000000000..0cf8b3ab70
--- /dev/null
+++ b/sysdeps/i386/i586/pthread_spin_trylock.S
@@ -0,0 +1 @@
+#include <sysdeps/i386/i486/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S
index d02f490986..79eed31752 100644
--- a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S
+++ b/sysdeps/i386/i686/pthread_spin_trylock.S
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_CMOV	1
-#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
+#include <sysdeps/i386/i486/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/nptl/Implies b/sysdeps/i386/nptl/Implies
deleted file mode 100644
index e454b288aa..0000000000
--- a/sysdeps/i386/nptl/Implies
+++ /dev/null
@@ -1 +0,0 @@
-x86/nptl
diff --git a/sysdeps/x86_64/64/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
index 5093c4c18b..5093c4c18b 100644
--- a/sysdeps/x86_64/64/nptl/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
diff --git a/sysdeps/x86_64/x32/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
index 8fcad2e566..8fcad2e566 100644
--- a/sysdeps/x86_64/x32/nptl/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h
index aad2e14c8d..aad2e14c8d 100644
--- a/sysdeps/x86/nptl/bits/pthreadtypes.h
+++ b/sysdeps/x86/bits/pthreadtypes.h
diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h
index 741a9e03fb..741a9e03fb 100644
--- a/sysdeps/x86/nptl/bits/semaphore.h
+++ b/sysdeps/x86/bits/semaphore.h
diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h
index 5befa53f30..5befa53f30 100644
--- a/sysdeps/x86/nptl/elide.h
+++ b/sysdeps/x86/elide.h
diff --git a/sysdeps/x86_64/nptl/Implies b/sysdeps/x86_64/nptl/Implies
deleted file mode 100644
index e454b288aa..0000000000
--- a/sysdeps/x86_64/nptl/Implies
+++ /dev/null
@@ -1 +0,0 @@
-x86/nptl