Update.

	* sysdeps/i386/i686/mempcpy.S: Fix typos.

	* sysdeps/i386/i686/strcmp.S: New file.
	* sysdeps/i386/i686/memcpy.S: New file.

4 files changed, 108 insertions, 5 deletions

diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S
new file mode 100644
index 0000000000..eab6855d57
--- /dev/null
+++ b/sysdeps/i386/i686/memcpy.S
@@ -0,0 +1,51 @@
+/* Copy memory block and return pointer to beginning of destination block
+   For Intel 80x86, x>=6.
+   This file is part of the GNU C Library.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include "asm-syntax.h"
+
+/* memcpy:
+	INPUT PARAMETER:
+	dest		(sp + 4)
+	src		(sp + 8)
+	len		(sp + 12)
+*/
+
+ENTRY(memcpy)
+	movl	12(%esp), %ecx
+	movl	%edi, %eax
+	movl	4(%esp), %edi
+	movl	%esi, %edx
+	movl	8(%esp), %esi
+	cld
+	shrl	$1, %ecx
+	jnc	1f
+	movsb
+1:	shrl	$1, %ecx
+	jnc	2f
+	movsw
+2:	rep
+	movsl
+	movl	%eax, %edi
+	movl	%edx, %esi
+	movl	4(%esp), %eax
+	ret
+END(memcpy)
diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
index 5760d9f940..4fb14a3d14 100644
--- a/sysdeps/i386/i686/mempcpy.S
+++ b/sysdeps/i386/i686/mempcpy.S
@@ -1,7 +1,7 @@
 /* Copy memory block and return pointer to following byte.
    For Intel 80x86, x>=6.
    This file is part of the GNU C Library.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <sysdep.h>
 #include "asm-syntax.h"
 
-/* strtok:
+/* mempcpy:
 	INPUT PARAMETER:
 	dest		(sp + 4)
 	src		(sp + 8)
@@ -30,11 +30,11 @@
 */
 
 ENTRY(__mempcpy)
+	movl	12(%esp), %ecx
 	movl	%edi, %eax
 	movl	4(%esp), %edi
 	movl	%esi, %edx
 	movl	8(%esp), %esi
-	movl	12(%esp), %ecx
 	cld
 	shrl	$1, %ecx
 	jnc	1f
@@ -47,5 +47,5 @@ ENTRY(__mempcpy)
 	xchgl	%edi, %eax
 	movl	%edx, %esi
 	ret
-END(mempcpy)
+END(__mempcpy)
 weak_alias (__mempcpy, mempcpy)
diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S
index 1f753b0350..83f8c50484 100644
--- a/sysdeps/i386/i686/memset.S
+++ b/sysdeps/i386/i686/memset.S
@@ -2,6 +2,7 @@
    Highly optimized version for ix86, x>=6.
    Copyright (C) 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -69,7 +70,10 @@ ENTRY (memset)
 	rep
 	stosb
 
-1:	movl	8(%esp), %eax
+1:
+#ifndef memset
+	movl	8(%esp), %eax
+#endif
 	popl	%edi
 	ret
 END (memset)
diff --git a/sysdeps/i386/i686/strcmp.S b/sysdeps/i386/i686/strcmp.S
new file mode 100644
index 0000000000..8ffc5b0bb5
--- /dev/null
+++ b/sysdeps/i386/i686/strcmp.S
@@ -0,0 +1,48 @@
+/* Highly optimized version for ix86, x>=6.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include "asm-syntax.h"
+
+/*
+   INPUT PARAMETERS:
+   s1          (sp + 4)
+   s2          (sp + 8)
+*/
+
+
+        .text
+ENTRY (strcmp)
+	movl	4(%esp), %ecx
+	movl	8(%esp), %edx
+1:	movb	(%ecx), %al
+	incl	%ecx
+	cmpb	(%edx), %al
+	jne	2f
+	incl	%edx
+	testb	%al, %al
+	jnz	1b
+	xorl	%eax, %eax
+	jmp	3f
+2:	movl	$1, %eax
+	ja	3f
+	negl	%eax
+3:	ret
+END (strcmp)