| Message ID | 20220526165003.705355-7-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Remove _dl_skip_args | expand |
On Thu, May 26, 2022 at 9:54 AM Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote: > > Since ad43cac44a the generic code already shuffles the argv/envp/auxv > on the stack to remove the ld.so own arguments and thus _dl_skip_args > is always 0. So there is no need to adjust the argc or argv. > > Checked on i686-linux-gnu. > --- > sysdeps/i386/dl-machine.h | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h > index 1f8d734215..8779983c8c 100644 > --- a/sysdeps/i386/dl-machine.h > +++ b/sysdeps/i386/dl-machine.h > @@ -143,17 +143,8 @@ _dl_start_user:\n\ > # Point %ebx at the GOT.\n\ > call 0b\n\ > addl $_GLOBAL_OFFSET_TABLE_, %ebx\n\ > - # See if we were run as a command with the executable file\n\ > - # name as an extra leading argument.\n\ > - movl _dl_skip_args@GOTOFF(%ebx), %eax\n\ > - # Pop the original argument count.\n\ > - popl %edx\n\ > - # Adjust the stack pointer to skip _dl_skip_args words.\n\ > - leal (%esp,%eax,4), %esp\n\ > - # Subtract _dl_skip_args from argc.\n\ > - subl %eax, %edx\n\ > - # Push argc back on the stack.\n\ > - push %edx\n\ > + # Read the original argument count.\n\ > + movl (%esp), %edx\n\ > # The special initializer gets called with the stack just\n\ > # as the application's entry point will see it; it can\n\ > # switch stacks if it moves these contents over.\n\ > -- > 2.34.1 > LGTM. Reviewed-by: H.J. Lu <hjl.tools@gmail.com> Thanks.
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 1f8d734215..8779983c8c 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -143,17 +143,8 @@ _dl_start_user:\n\ # Point %ebx at the GOT.\n\ call 0b\n\ addl $_GLOBAL_OFFSET_TABLE_, %ebx\n\ - # See if we were run as a command with the executable file\n\ - # name as an extra leading argument.\n\ - movl _dl_skip_args@GOTOFF(%ebx), %eax\n\ - # Pop the original argument count.\n\ - popl %edx\n\ - # Adjust the stack pointer to skip _dl_skip_args words.\n\ - leal (%esp,%eax,4), %esp\n\ - # Subtract _dl_skip_args from argc.\n\ - subl %eax, %edx\n\ - # Push argc back on the stack.\n\ - push %edx\n\ + # Read the original argument count.\n\ + movl (%esp), %edx\n\ # The special initializer gets called with the stack just\n\ # as the application's entry point will see it; it can\n\ # switch stacks if it moves these contents over.\n\