3 files changed, 53 insertions, 1 deletions
diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/i386/i686/hp-timing.h
index ffbeb27..004cfff 100644
--- a/sysdeps/i386/i686/hp-timing.h
+++ b/sysdeps/i386/i686/hp-timing.h
@@ -84,7 +84,7 @@
 /* We use 64bit values for the times.  */
 typedef unsigned long long int hp_timing_t;
 
-/* Internal variabled used to store the overhead of the measurement
+/* Internal variable used to store the overhead of the measurement
    opcodes.  */
 extern hp_timing_t __libc_hp_timing_overhead;
 
diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
new file mode 100644
index 0000000..5760d9f
--- /dev/null
+++ b/sysdeps/i386/i686/mempcpy.S
@@ -0,0 +1,51 @@
+/* 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.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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"
+
+/* strtok:
+	INPUT PARAMETER:
+	dest		(sp + 4)
+	src		(sp + 8)
+	len		(sp + 12)
+*/
+
+ENTRY(__mempcpy)
+	movl	%edi, %eax
+	movl	4(%esp), %edi
+	movl	%esi, %edx
+	movl	8(%esp), %esi
+	movl	12(%esp), %ecx
+	cld
+	shrl	$1, %ecx
+	jnc	1f
+	movsb
+1:	shrl	$1, %ecx
+	jnc	2f
+	movsw
+2:	rep
+	movsl
+	xchgl	%edi, %eax
+	movl	%edx, %esi
+	ret
+END(mempcpy)
+weak_alias (__mempcpy, mempcpy)
diff --git a/sysdeps/i386/i686/strtok.S b/sysdeps/i386/i686/strtok.S
index c7a058e..18aa7c8 100644
--- a/sysdeps/i386/i686/strtok.S
+++ b/sysdeps/i386/i686/strtok.S
@@ -73,6 +73,7 @@ ENTRY (FUNCTION)
 	movl $64, %ecx
 	movl %esp, %edi
 	xorl %eax, %eax
+	cld
 	rep
 	stosl