Index: boot/generic/include/memstr.h
===================================================================
--- boot/generic/include/memstr.h	(revision 8a5a902af34592bce127314cf2fc188c642817f3)
+++ boot/generic/include/memstr.h	(revision 26346bd55c100239a5c5aade700dd038b5a04f7b)
@@ -35,4 +35,7 @@
 #include <typedefs.h>
 
+#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+
 extern void *memmove(void *, const void *, size_t);