x86_64: Remove _dl_skip_args usage

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 x86_64-linux-gnu and i686-linux-gnu.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 7f607f6dff557e9526e54c9eec1224c6b269c4bf..b9122944b9a7f7a00baef7f5e79d7c9ace2a6ab7 100644 (file)
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -140,17 +140,8 @@ _start:\n\
 _dl_start_user:\n\
        # Save the user entry point address in %r12.\n\
        movq %rax, %r12\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(%rip), %eax\n\
-       # Pop the original argument count.\n\
-       popq %rdx\n\
-       # Adjust the stack pointer to skip _dl_skip_args words.\n\
-       leaq (%rsp,%rax,8), %rsp\n\
-       # Subtract _dl_skip_args from argc.\n\
-       subl %eax, %edx\n\
-       # Push argc back on the stack.\n\
-       pushq %rdx\n\
+       # Read the original argument count.\n\
+       movq (%rsp), %rdx\n\
        # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\
        # argc -> rsi\n\
        movq %rdx, %rsi\n\

diff --git a/sysdeps/x86_64/x32/dl-machine.h b/sysdeps/x86_64/x32/dl-machine.h
index 331374069e834c53aa7550b0babd819abc88ae8f..681016c8d8a2ec123157a9d8f38e3796b95e0ba3 100644 (file)
--- a/sysdeps/x86_64/x32/dl-machine.h
+++ b/sysdeps/x86_64/x32/dl-machine.h
@@ -45,18 +45,8 @@ _start:\n\
 _dl_start_user:\n\
        # Save the user entry point address in %r12.\n\
        movl %eax, %r12d\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(%rip), %eax\n\
-       # Pop the original argument count.\n\
+       # Read the original argument count.\n\
        movl (%rsp), %edx\n\
-       # Adjust the stack pointer to skip _dl_skip_args words.\n\
-       lea 4(%rsp,%rax,4), %esp\n\
-       # Subtract _dl_skip_args from argc.\n\
-       subl %eax, %edx\n\
-       # Push argc back on the stack.\n\
-       subl $4, %esp\n\
-       movl %edx, (%rsp)\n\
        # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\
        # argc -> rsi\n\
        movl %edx, %esi\n\