Move i486/pthread_spin_trylock.S to pthread_spin_trylock.S

Since glibc doesn't support i386 any more, we can move
i486/pthread_spin_trylock.S to pthread_spin_trylock.S

	* sysdeps/i386/i486/pthread_spin_trylock.S: Moved to ...
	* sysdeps/i386/pthread_spin_trylock.S: Here.
	* sysdeps/i386/i586/pthread_spin_trylock.S: Removed.
	* sysdeps/i386/i686/pthread_spin_trylock.S: Updated.

diff --git a/ChangeLog b/ChangeLog
index f44a4d9e034ea31c225248c74f57e2b148d4232b..b9e5dbc3bfcd69f49df3202f23dc24a765047bfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i486/pthread_spin_trylock.S: Moved to ...
+       * sysdeps/i386/pthread_spin_trylock.S: Here.
+       * sysdeps/i386/i586/pthread_spin_trylock.S: Removed.
+       * sysdeps/i386/i686/pthread_spin_trylock.S: Updated.
+
 2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/i386/i486/string-inlines.c: Moved to ...

diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S
deleted file mode 100644 (file)
index 0cf8b3a..0000000
--- a/sysdeps/i386/i586/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/pthread_spin_trylock.S>

diff --git a/sysdeps/i386/i686/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S
index 924c4d728e779b6709cdeabb383ea64e7acb773c..9da05ee3ff6a7755404a4aa035f6a8566a5f7290 100644 (file)
--- a/sysdeps/i386/i686/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/pthread_spin_trylock.S>
+#include <sysdeps/i386/pthread_spin_trylock.S>

diff --git a/sysdeps/i386/i486/pthread_spin_trylock.S b/sysdeps/i386/pthread_spin_trylock.S
similarity index 100%
rename from sysdeps/i386/i486/pthread_spin_trylock.S
rename to sysdeps/i386/pthread_spin_trylock.S