qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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-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.
This commit is contained in:
Mark Kettenis 2001-03-24 14:36:00 +00:00
parent cb2072400d
commit 8443afdc7c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2001-03-22 Andreas Jaeger <aj@suse.de>
* iconvdata/Makefile (generated): Add iconv-test.xxx. * iconvdata/Makefile (generated): Add iconv-test.xxx.

11
sysdeps/mach/hurd/i386/init-first.c
View File

@ -1,5 +1,5 @@
/* Initialization code run first thing by the ELF startup code. For i386/Hurd. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <assert.h>
#include <hurd.h> #include <hurd.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -42,6 +43,7 @@ int __libc_multiple_libcs = 1;
extern int __libc_argc; extern int __libc_argc;
extern char **__libc_argv; extern char **__libc_argv;
extern char **_dl_argv;
void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ void *(*_cthread_init_routine) (void); /* Returns new SP to use. */
void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__)); void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__));
@ -165,6 +167,13 @@ init (int *data)
newsp = memcpy (newsp - ((char *) &d[1] - (char *) data), data, newsp = memcpy (newsp - ((char *) &d[1] - (char *) data), data,
(char *) d - (char *) 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 /* Set up the Hurd startup data block immediately following
the argument and environment pointers on the new stack. */ the argument and environment pointers on the new stack. */
od = (newsp + ((char *) d - (char *) data)); od = (newsp + ((char *) d - (char *) data));