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 | |
| parent | 91f62ce6b5797f04006ac5aff08416ecd61bf972 (diff) | |
| download | glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.tar glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.tar.gz glibc-24906b43b9bd9108aef17d18dfbb8764212085f7.tar.bz2 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')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 6 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 17 |
2 files changed, 12 insertions, 11 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 diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 800c2d7b68..546828093f 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -182,15 +182,16 @@ _dl_start_user:\n\ addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\n\ # See if we were run as a command with the executable file\n\ # name as an extra leading argument.\n\ - movl rtld_command@GOT(%ebx), %eax\n\ + movl _dl_skip_args@GOT(%ebx), %eax\n\ movl (%eax),%eax\n\ - testl %eax,%eax\n\ - jz 0f\n\ - # Pop the original argument count, decrement it, and replace\n\ - # the original first argument pointer with the new count.\n\ - popl %eax\n\ - decl %eax\n\ - movl %eax,(%esp)\n\ + # Pop the original argument count.\n\ + popl %ecx\n\ + # Subtract _dl_skip_args from it.\n\ + subl %eax, %ecx\n\ + # Adjust the stack pointer to skip _dl_skip_args words.\n\ + leal (%esp,%eax,4), %esp\n\ + # Push back the modified argument count.\n\ + pushl %ecx\n\ # Call _dl_init_next to return the address of an initializer\n\ # function to run.\n\ 0: call _dl_init_next@PLT\n\ |