about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-08-27 07:56:19 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-27 07:56:41 -0700
commit8964482ab8c9f14719bbce304ff89549c90f2bda (patch)
tree9b71062f42c1c233451ffe56e4190cce086a351d
parent413db45d1bfb11ab1b2e8307d4b519d5169c0b7b (diff)
downloadglibc-8964482ab8c9f14719bbce304ff89549c90f2bda.tar.gz
glibc-8964482ab8c9f14719bbce304ff89549c90f2bda.tar.xz
glibc-8964482ab8c9f14719bbce304ff89549c90f2bda.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/i686/multiarch/strcat.S2
-rw-r--r--sysdeps/i386/strcat.S (renamed from sysdeps/i386/i486/strcat.S)0
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9e5dbc3bf..223db0d466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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 ...
 	* sysdeps/i386/pthread_spin_trylock.S: Here.
 	* sysdeps/i386/i586/pthread_spin_trylock.S: Removed.
diff --git a/sysdeps/i386/i686/multiarch/strcat.S b/sysdeps/i386/i686/multiarch/strcat.S
index 45d84cdf4e..e893815e24 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
index 88c29fb572..88c29fb572 100644
--- a/sysdeps/i386/i486/strcat.S
+++ b/sysdeps/i386/strcat.S