Index: boot/generic/include/memstr.h
===================================================================
--- boot/generic/include/memstr.h	(revision 193d280c34f38846eccfa1ecce71975f9ad92398)
+++ boot/generic/include/memstr.h	(revision 4d11204a6f45850dfd155527e40dd9bf4c7b7bef)
@@ -36,8 +36,11 @@
 
 extern void *memcpy(void *, const void *, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+    __attribute__((nonnull(1, 2)))
+    __attribute__((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memset(void *, int, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
-extern void *memmove(void *, const void *, size_t);
+    __attribute__((nonnull(1)))
+    __attribute__((optimize("-fno-tree-loop-distribute-patterns")));
+extern void *memmove(void *, const void *, size_t)
+    __attribute__((nonnull(1, 2)));
 
 #endif