[COMMITTED] x86: Consolidate unnecessary nptl/ subdirectories.
Commit Message
Verified no code changes on x86_64-linux-gnu and i686-linux-gnu.
Thanks,
Roland
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.
similarity index 100%
rename from sysdeps/i386/i486/nptl/pthread_spin_trylock.S
rename to sysdeps/i386/i486/pthread_spin_trylock.S
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
new file mode 100644
@@ -0,0 +1 @@
+#include <sysdeps/i386/i486/pthread_spin_trylock.S>
similarity index 93%
rename from sysdeps/i386/i686/nptl/pthread_spin_trylock.S
rename to 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>
deleted file mode 100644
@@ -1 +0,0 @@
-x86/nptl
similarity index 100%
rename from sysdeps/x86_64/64/nptl/shlib-versions
rename to sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
similarity index 100%
rename from sysdeps/x86_64/x32/nptl/shlib-versions
rename to sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
similarity index 100%
rename from sysdeps/x86/nptl/bits/pthreadtypes.h
rename to sysdeps/x86/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/x86/nptl/bits/semaphore.h
rename to sysdeps/x86/bits/semaphore.h
similarity index 100%
rename from sysdeps/x86/nptl/elide.h
rename to sysdeps/x86/elide.h
deleted file mode 100644
@@ -1 +0,0 @@
-x86/nptl