Move i486/strcat.S to strcat.S

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

	* sysdeps/i386/i486/strcat.S: Moved to ...
	* sysdeps/i386/strcat.S: Here.
	* sysdeps/i386/i686/multiarch/strcat.S: Updated.

diff --git a/ChangeLog b/ChangeLog
index b9e5dbc3bfcd69f49df3202f23dc24a765047bfb..223db0d4663093c478267b99eaee494aa971319f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i486/strcat.S: Moved to ...
+       * sysdeps/i386/strcat.S: Here.
+
 2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/i386/i486/pthread_spin_trylock.S: Moved to ...

diff --git a/sysdeps/i386/i686/multiarch/strcat.S b/sysdeps/i386/i686/multiarch/strcat.S
index 45d84cdf4eab450d5071c7e9937371916d087552..e893815e24b8f060df0883afbc53547c98c57aa8 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcat.S
+++ b/sysdeps/i386/i686/multiarch/strcat.S
@@ -88,5 +88,5 @@ END(STRCAT)
 #endif
 
 #ifndef USE_AS_STRNCAT
-# include "../../i486/strcat.S"
+# include "../../strcat.S"
 #endif

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