--- Rules.mak.org	2005-11-23 15:07:32.000000000 +0900
+++ Rules.mak	2005-11-23 17:34:16.000000000 +0900
@@ -1,4 +1,4 @@
-# Rules.make for busybox
+## Rules.make for busybox
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
@@ -72,12 +72,15 @@ BB_SRC_DIR=
 # Red Hat 5.x and glibc 2.0) uncomment the following.  Be sure to read about
 # using the compatible RPMs (compat-*) at http://www.redhat.com !
 #LIBCDIR:=/usr/i386-glibc20-linux
+LIBCDIR:=/usr/local/m32r-linux-uclibc/usr
 #
 # For other libraries, you are on your own.  But these may (or may not) help...
 #LDFLAGS+=-nostdlib
 #LIBRARIES:=$(LIBCDIR)/lib/libc.a -lgcc
 #CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
 #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
+LDFLAGS+=-nostartfiles $(LIBCDIR)/lib/crt0.o -mmodel-medium -elf2flt="" -L$(LIBCDIR)/lib -lc -lgcc
+CROSS_CFLAGS+=-I$(LIBCDIR)/include  -mmodel=medium
 
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
 CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
@@ -122,6 +125,9 @@ OPTIMIZATION=${call check_gcc,-Os,-O2}
 ifeq ($(strip $(TARGET_ARCH)),arm)
 	OPTIMIZATION+=-fstrict-aliasing
 endif
+ifeq ($(strip $(TARGET_ARCH)),m32r)
+	OPTIMIZATION+=-fstrict-aliasing
+endif
 ifeq ($(strip $(TARGET_ARCH)),i386)
 	OPTIMIZATION+=$(call check_gcc,-march=i386,)
 	OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,)
@@ -159,7 +165,8 @@ ifeq ($(strip $(CONFIG_DEBUG)),y)
 else
     CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG
     LDFLAGS += -s -Wl,-warn-common
-    STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
+    #STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
+    STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
 endif
 ifeq ($(strip $(CONFIG_STATIC)),y)
     LDFLAGS += --static
--- networking/httpd.c.org	2005-11-23 19:06:11.000000000 +0900
+++ networking/httpd.c	2005-11-23 19:13:26.000000000 +0900
@@ -1134,7 +1134,7 @@ static int sendCgi(const char *url,
 	*script = '/';          /* is directory, find next '/' */
       }
       addEnv("PATH", "INFO", script);   /* set /PATH_INFO or NULL */
-      addEnv("PATH",           "",         getenv("PATH"));
+      /* addEnv("PATH",           "",         getenv("PATH")); */
       addEnv("REQUEST",        "METHOD",   request);
       if(config->query) {
 	char *uri = alloca(strlen(purl) + 2 + strlen(config->query));
--- networking/inetd.c.org	2005-11-23 19:07:47.000000000 +0900
+++ networking/inetd.c	2005-11-23 19:08:08.000000000 +0900
@@ -763,7 +763,7 @@ extern int inetd_main(int argc, char *ar
 	if (!(opt & 2)) {
 	    daemon(0, 0);
 	    /* reexec for vfork() do continue parent */
-	    vfork_daemon_rexec(argc, argv, "-f");
+	    vfork_daemon_rexec(0, 0, argc, argv, "-f");
 	}
 #else
 	opt = bb_getopt_ulflags(argc, argv, "q:", &sq);