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, 5 insertions, 3 deletions

diff --git a/mdk-stage1/dietlibc/lib/strstr.c b/mdk-stage1/dietlibc/lib/strstr.c
index 641d9d7ac..0632cc28a 100644
--- a/mdk-stage1/dietlibc/lib/strstr.c
+++ b/mdk-stage1/dietlibc/lib/strstr.c
@@ -2,12 +2,14 @@
 #include <string.h>
 
 char *strstr(const char *haystack, const char *needle) {
-  int nl=strlen(needle);
-  int hl=strlen(haystack);
+  size_t nl=strlen(needle);
+  size_t hl=strlen(haystack);
   int i;
+  if (!nl) goto found;
   if (nl>hl) return 0;
   for (i=hl-nl+1; i; --i) {
-    if (!memcmp(haystack,needle,nl))
+    if (*haystack==*needle && !memcmp(haystack,needle,nl))
+found:
       return (char*)haystack;
     ++haystack;
   }