diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-26 13:14:37 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-30 16:33:31 -0300 |
| commit | b6712b137f2ba6160599bdae60b8562bb6361737 (patch) | |
| tree | d3c07c9c84686f42e7c41d5ac171b0fabf5d007a /sysdeps/sparc/sparc64 | |
| parent | 4dc1f6530e22df8ccab75b65300f3dd731e3539b (diff) | |
| download | glibc-b6712b137f2ba6160599bdae60b8562bb6361737.zip glibc-b6712b137f2ba6160599bdae60b8562bb6361737.tar.gz glibc-b6712b137f2ba6160599bdae60b8562bb6361737.tar.bz2 | |
sparc: 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 sparc64-linux-gnu and sparcv9-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/sparc/sparc64')
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 8c4bab1..d34d9aa 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -245,45 +245,9 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], " add %l7, %o7, %l7\n" \ " /* Save the user entry point address in %l0. */\n" \ " mov %o0, %l0\n" \ -" /* See if we were run as a command with the executable file name as an\n" \ -" extra leading argument. If so, we must shift things around since we\n" \ -" must keep the stack doubleword aligned. */\n" \ - RTLD_GOT_ADDRESS(%l7, %g5, _dl_skip_args) \ -" ld [%g5], %i0\n" \ -" brz,pt %i0, 2f\n" \ -" ldx [%sp + " __S(STACK_BIAS) " + 22*8], %i5\n" \ -" /* Find out how far to shift. */\n" \ -" sub %i5, %i0, %i5\n" \ -" sllx %i0, 3, %l6\n" \ - RTLD_GOT_ADDRESS(%l7, %l4, _dl_argv) \ -" stx %i5, [%sp + " __S(STACK_BIAS) " + 22*8]\n" \ -" add %sp, " __S(STACK_BIAS) " + 23*8, %i1\n" \ -" add %i1, %l6, %i2\n" \ -" ldx [%l4], %l5\n" \ -" /* Copy down argv. */\n" \ -"12: ldx [%i2], %i3\n" \ -" add %i2, 8, %i2\n" \ -" stx %i3, [%i1]\n" \ -" brnz,pt %i3, 12b\n" \ -" add %i1, 8, %i1\n" \ -" sub %l5, %l6, %l5\n" \ -" /* Copy down envp. */\n" \ -"13: ldx [%i2], %i3\n" \ -" add %i2, 8, %i2\n" \ -" stx %i3, [%i1]\n" \ -" brnz,pt %i3, 13b\n" \ -" add %i1, 8, %i1\n" \ -" /* Copy down auxiliary table. */\n" \ -"14: ldx [%i2], %i3\n" \ -" ldx [%i2 + 8], %i4\n" \ -" add %i2, 16, %i2\n" \ -" stx %i3, [%i1]\n" \ -" stx %i4, [%i1 + 8]\n" \ -" brnz,pt %i3, 14b\n" \ -" add %i1, 16, %i1\n" \ -" stx %l5, [%l4]\n" \ +" ldx [%sp + " __S(STACK_BIAS) " + 22*8], %i5\n" \ " /* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */\n" \ -"2:\t" RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) \ +"" RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) \ " sllx %i5, 3, %o3\n" \ " add %sp, " __S(STACK_BIAS) " + 23*8, %o2\n" \ " add %o3, 8, %o3\n" \ |