Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

1 files changed, 8 insertions, 4 deletions

diff --git a/mdk-stage1/dietlibc/lib/memchr.c b/mdk-stage1/dietlibc/lib/memchr.c
index 93d81328a..ae76bb150 100644
--- a/mdk-stage1/dietlibc/lib/memchr.c
+++ b/mdk-stage1/dietlibc/lib/memchr.c
@@ -1,9 +1,13 @@
 #include <sys/types.h>
+#include <string.h>
 
-char *memchr(const char *s, int c, size_t n) {
+void* memchr(const void *s, int c, size_t n) {
+  register const char* t=s;
   int i;
-  for (i=n; i; --i)
-    if (*s++==c)
-      return (char*)s;
+  for (i=n; i; --i) {
+    if (*t==c)
+      return (char*)t;
+    ++t;
+  }
   return 0;
 }