Index: include/memstr.h
===================================================================
--- include/memstr.h	(revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6)
+++ include/memstr.h	(revision d2bb9f8a111b1aebb99a97f7a643311460462e4b)
@@ -33,6 +33,5 @@
 #include <arch/types.h>
 
-extern char *memcpy(void * dst, const void *src, size_t cnt);
-extern char *memcopy(void * dst, const void *src, size_t cnt);
+#define memcpy(dst, src, cnt)	__builtin_memcpy((dst), (src), (cnt)); 
 
 extern void memsetw(__address dst, size_t cnt, __u16 x);
@@ -44,5 +43,5 @@
  * Architecture independent variants.
  */
-extern char *_memcopy(void *dst, const void *src, size_t cnt);
+extern char *_memcpy(void *dst, const void *src, size_t cnt);
 extern void _memsetb(__address dst, size_t cnt, __u8 x);
 extern void _memsetw(__address dst, size_t cnt, __u16 x);