From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 27 Aug 2015 14:56:19 +0000 (-0700)
Subject: Move i486/strcat.S to strcat.S
X-Git-Tag: glibc-2.23~542
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8964482ab8c9f14719bbce304ff89549c90f2bda;p=thirdparty%2Fglibc.git

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 b9e5dbc3bfc..223db0d4663 100644
--- 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 45d84cdf4ea..e893815e24b 100644
--- 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