* sysdeps/mach/hurd/i386/init-first.c: Include <assert.h>. (_dl_argv): Declare. ...

2001-03-24  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/mach/hurd/i386/init-first.c: Include <assert.h>.
	(_dl_argv): Declare.
	(init) [SHARED]: Readjust _dl_argv if we switched to a new stack.

diff --git a/ChangeLog b/ChangeLog
index 0d5345764c360070f5f4d72605b435b41cc014d4..7b5f041bc0ed0d3aee08db3766a8f136358125ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-24  Mark Kettenis  <kettenis@gnu.org>
+
+       * sysdeps/mach/hurd/i386/init-first.c: Include <assert.h>.
+       (_dl_argv): Declare.
+       (init) [SHARED]: Readjust _dl_argv if we switched to a new stack.
+
 2001-03-22  Andreas Jaeger  <aj@suse.de>
 
        * iconvdata/Makefile (generated): Add iconv-test.xxx.

diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index b26a9da7dc0b0b3e57d282d8e27e07e771d4ef3a..4e1b6bc83578d143810534c3eea857938f0be71a 100644 (file)
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -1,5 +1,5 @@
 /* Initialization code run first thing by the ELF startup code.  For i386/Hurd.
-   Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <assert.h>
 #include <hurd.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -42,6 +43,7 @@ int __libc_multiple_libcs = 1;
 
 extern int __libc_argc;
 extern char **__libc_argv;
+extern char **_dl_argv;
 
 void *(*_cthread_init_routine) (void); /* Returns new SP to use.  */
 void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__));
@@ -165,6 +167,13 @@ init (int *data)
       newsp = memcpy (newsp - ((char *) &d[1] - (char *) data), data,
                      (char *) d - (char *) data);
 
+#ifdef SHARED
+      /* And readjust the dynamic linker's idea of where the argument
+         vector lives.  */
+      assert (_dl_argv == argv);
+      _dl_argv = (void *) ((int *) newsp + 1);
+#endif
+
       /* Set up the Hurd startup data block immediately following
         the argument and environment pointers on the new stack.  */
       od = (newsp + ((char *) d - (char *) data));