1998-09-05 Mark Kettenis <kettenis@phys.uva.nl>

	* sysdeps/mach/hurd/i386/init-first.c (init1): Call
	__getopt_clean_environment with __environ instead of envp.

	* sysdeps/mach/hurd/i386/Makefile (omit-deps): Define to crt0.

diff --git a/ChangeLog b/ChangeLog
index 1ead6569ea26abb6e66a2c5745a1666925c7ed67..f929887f55ea88314b36c724cc853eaf3d0278df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+1998-09-05  Mark Kettenis  <kettenis@phys.uva.nl>
+
+       * sysdeps/mach/hurd/i386/init-first.c (init1): Call
+       __getopt_clean_environment with __environ instead of envp.
+
 1998-09-05  Roland McGrath  <roland@baalperazim.frob.com>
 
+       * sysdeps/mach/hurd/i386/Makefile (omit-deps): Define to crt0.
+
        * string/argz-extract.c (__argz_extract): Add de-consting cast for
        setting results.
 

diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index 49f609c51002646be14e00641283544b4d660fcc..33b701df048ce9cbe03bdbb968dc1dccd61a1aa6 100644 (file)
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -1,6 +1,7 @@
 ifeq ($(subdir),csu)
 extra-objs += crt0.o
 install-lib += crt0.o
+omit-deps += crt0
 
 $(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o
        $(link-relocatable)

diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index c90ae3d3fdc45405030aa5ac8286462d205d3529..5bca3a6b098948da4465c047ba38f3760137fb0f 100644 (file)
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -113,7 +113,7 @@ init1 (int argc, char *arg0, ...)
   __libc_init (argc, argv, __environ);
 
   /* This is a hack to make the special getopt in GNU libc working.  */
-  __getopt_clean_environment (envp);
+  __getopt_clean_environment (__environ);
 
 #ifdef PIC
   __libc_global_ctors ();