From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Szabolcs Nagy <Szabolcs.Nagy@arm.com>
Subject: [PATCH 15/17] sparc: Remove _dl_skip_args usage
Date: Thu, 26 May 2022 13:50:01 -0300 [thread overview]
Message-ID: <20220526165003.705355-16-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20220526165003.705355-1-adhemerval.zanella@linaro.org>
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.
---
sysdeps/sparc/sparc32/dl-machine.h | 43 ++----------------------------
sysdeps/sparc/sparc64/dl-machine.h | 40 ++-------------------------
2 files changed, 4 insertions(+), 79 deletions(-)
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index 8c2408b1e6..8baf45be52 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -196,48 +196,9 @@ _dl_start_user:\n\
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, adjust the contents of the stack. */\n\
- " RTLD_GOT_ADDRESS(%l7, %g2, _dl_skip_args) "\n\
- ld [%g2], %i0\n\
- tst %i0\n\
- beq 3f\n\
- ld [%sp+22*4], %i5 /* load argc */\n\
- /* Find out how far to shift. */\n\
- " RTLD_GOT_ADDRESS(%l7, %l3, _dl_argv) "\n\
- sub %i5, %i0, %i5\n\
- ld [%l3], %l4\n\
- sll %i0, 2, %i2\n\
- st %i5, [%sp+22*4]\n\
- sub %l4, %i2, %l4\n\
- add %sp, 23*4, %i1\n\
- add %i1, %i2, %i2\n\
- st %l4, [%l3]\n\
- /* Copy down argv */\n\
-21: ld [%i2], %i3\n\
- add %i2, 4, %i2\n\
- tst %i3\n\
- st %i3, [%i1]\n\
- bne 21b\n\
- add %i1, 4, %i1\n\
- /* Copy down env */\n\
-22: ld [%i2], %i3\n\
- add %i2, 4, %i2\n\
- tst %i3\n\
- st %i3, [%i1]\n\
- bne 22b\n\
- add %i1, 4, %i1\n\
- /* Copy down auxiliary table. */\n\
-23: ld [%i2], %i3\n\
- ld [%i2+4], %i4\n\
- add %i2, 8, %i2\n\
- tst %i3\n\
- st %i3, [%i1]\n\
- st %i4, [%i1+4]\n\
- bne 23b\n\
- add %i1, 8, %i1\n\
+ ld [%sp+22*4], %i5 /* load argc */\n\
/* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */\n\
-3: " RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) "\n\
+ " RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) "\n\
add %sp, 23*4, %o2\n\
sll %i5, 2, %o3\n\
add %o3, 4, %o3\n\
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 8c4bab14fc..d34d9aa470 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" \
--
2.34.1
next prev parent reply other threads:[~2022-05-26 16:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 16:49 [PATCH 00/17] Remove _dl_skip_args Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 01/17] alpha: Remove _dl_skip_args usage Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 02/17] arm: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 03/17] arc: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 04/17] csky: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 05/17] hppa: Remove _dl_skip_args usage (BZ# 29165) Adhemerval Zanella
2022-05-26 18:14 ` Florian Weimer
2022-05-26 18:23 ` Adhemerval Zanella
2022-05-26 18:34 ` Florian Weimer
2022-05-26 18:58 ` John David Anglin
2022-05-26 23:10 ` Adhemerval Zanella
2022-05-27 0:01 ` John David Anglin
2022-05-27 12:23 ` Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 06/17] i686: Remove _dl_skip_args usage Adhemerval Zanella
2022-05-26 20:53 ` H.J. Lu
2022-05-26 16:49 ` [PATCH 07/17] ia64: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 08/17] m68k: " Adhemerval Zanella
2022-05-26 17:18 ` Andreas Schwab
2022-05-26 17:23 ` Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 09/17] microblaze: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 10/17] mips: " Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 11/17] nios2: Remove _dl_skip_args usage (BZ# 29187) Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 12/17] riscv: Remove _dl_skip_args usage Adhemerval Zanella
2022-05-26 16:49 ` [PATCH 13/17] s390: " Adhemerval Zanella
2022-05-26 16:50 ` [PATCH 14/17] sh: " Adhemerval Zanella
2022-05-26 16:50 ` Adhemerval Zanella [this message]
2022-05-26 16:50 ` [PATCH 16/17] x86_64: " Adhemerval Zanella
2022-05-26 20:52 ` H.J. Lu
2022-05-26 16:50 ` [PATCH 17/17] elf: Remove _dl_skip_args Adhemerval Zanella
2022-05-30 13:32 ` [PATCH 00/17] " Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220526165003.705355-16-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=Szabolcs.Nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).