diff options
| author | Roland McGrath <roland@gnu.org> | 1995-09-28 18:42:29 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-09-28 18:42:29 +0000 |
| commit | 24906b43b9bd9108aef17d18dfbb8764212085f7 (patch) | |
| tree | 48d641dc176c9941b3b036e66c383b00a6974bad /sysdeps/generic | |
| parent | 91f62ce6b5797f04006ac5aff08416ecd61bf972 (diff) | |
| download | glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.tar.gz glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.tar.xz glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.zip | |
Thu Sep 28 13:05:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
Merge new message handling code from GNU gettext, by Drepper. * intl: New directory. * Makefile (subdirs): Add intl. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Return USER_ENTRY instead of storing it on our stack. * elf/rtld.c (rtld_command): Variable removed. (_dl_skip_args): New variable. (dl_main): Increment _dl_skip_args instead of setting rtld_command. If the link_map for the executable itself is not first in the chain, make it so. * sysdeps/i386/dl-machine.h (RTLD_START): Use _dl_skip_args as count of args to skip. Thu Sep 28 09:20:04 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu> * stdlib/strtod.c (STRTOF): Fix handling of numbers with lots of leading zeroes.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index c1cf37da76..49eaad6737 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -42,13 +42,13 @@ _dl_sysdep_start (void **start_argptr, user_entry = (Elf32_Addr) &_start; _dl_argc = *(int *) start_argptr; - _dl_argv = start_argptr + 1; + _dl_argv = (char **) start_argptr + 1; _environ = &_dl_argv[_dl_argc + 1]; start_argptr = (void **) _environ; while (*start_argptr) ++start_argptr; - for (av = ++start_argptr; av->a_type != AT_NULL; ++av) + for (av = (void *) ++start_argptr; av->a_type != AT_NULL; ++av) switch (av->a_type) { case AT_PHDR: @@ -77,7 +77,7 @@ _dl_sysdep_start (void **start_argptr, _dl_secure = uid != euid || gid != egid; (*dl_main) (phdr, phnum, &user_entry); - start_argptr[-1] = (void *) user_entry; + return user_entry; } int |