diff mbox

[COMMITTED] x86: Consolidate unnecessary nptl/ subdirectories.

Message ID 20140625024038.281692C3A25@topped-with-meat.com
State Committed
Headers show

Commit Message

Roland McGrath June 25, 2014, 2:40 a.m. UTC
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.
diff mbox

Patch

diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S
similarity index 100%
rename from sysdeps/i386/i486/nptl/pthread_spin_trylock.S
rename to 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 a0c90b5..0000000
--- 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 0000000..0cf8b3a
--- /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
similarity index 93%
rename from sysdeps/i386/i686/nptl/pthread_spin_trylock.S
rename to sysdeps/i386/i686/pthread_spin_trylock.S
index d02f490..79eed31 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 e454b28..0000000
--- 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
similarity index 100%
rename from sysdeps/x86_64/64/nptl/shlib-versions
rename to 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
similarity index 100%
rename from sysdeps/x86_64/x32/nptl/shlib-versions
rename to sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/x86/nptl/bits/pthreadtypes.h
rename to sysdeps/x86/bits/pthreadtypes.h
diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h
similarity index 100%
rename from sysdeps/x86/nptl/bits/semaphore.h
rename to sysdeps/x86/bits/semaphore.h
diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h
similarity index 100%
rename from sysdeps/x86/nptl/elide.h
rename to sysdeps/x86/elide.h
diff --git a/sysdeps/x86_64/nptl/Implies b/sysdeps/x86_64/nptl/Implies
deleted file mode 100644
index e454b28..0000000
--- a/sysdeps/x86_64/nptl/Implies
+++ /dev/null
@@ -1 +0,0 @@ 
-x86/nptl