From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Szabolcs Nagy <Szabolcs.Nagy@arm.com>
Subject: [PATCH 02/17] arm: Remove _dl_skip_args usage
Date: Thu, 26 May 2022 13:49:48 -0300 [thread overview]
Message-ID: <20220526165003.705355-3-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. It makes the _fixup_stack branch ununsed.
Checked with qemu-user that arguments are correctly passed on both
constructors and main program.
---
sysdeps/arm/dl-machine.h | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 2a7f795e46..6a422713bd 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -130,9 +130,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
_start:\n\
@ we are PIC code, so get global offset table\n\
ldr sl, .L_GET_GOT\n\
- @ See if we were run as a command with the executable file\n\
- @ name as an extra leading argument.\n\
- ldr r4, .L_SKIP_ARGS\n\
@ at start time, all the args are on the stack\n\
mov r0, sp\n\
bl _dl_start\n\
@@ -147,10 +144,6 @@ _dl_start_user:\n\
ldr r1, [sp]\n\
@ get the argv address\n\
add r2, sp, #4\n\
- @ Fix up the stack if necessary.\n\
- cmp r4, #0\n\
- bne .L_fixup_stack\n\
-.L_done_fixup:\n\
@ compute envp\n\
add r3, r2, r1, lsl #2\n\
add r3, r3, #4\n\
@@ -164,41 +157,9 @@ _dl_start_user:\n\
add r0, sl, r0\n\
@ jump to the user_s entry point\n\
" BX(r6) "\n\
-\n\
- @ iWMMXt and EABI targets require the stack to be eight byte\n\
- @ aligned - shuffle arguments etc.\n\
-.L_fixup_stack:\n\
- @ subtract _dl_skip_args from original arg count\n\
- sub r1, r1, r4\n\
- @ store the new argc in the new stack location\n\
- str r1, [sp]\n\
- @ find the first unskipped argument\n\
- mov r3, r2\n\
- add r4, r2, r4, lsl #2\n\
- @ shuffle argv down\n\
-1: ldr r5, [r4], #4\n\
- str r5, [r3], #4\n\
- cmp r5, #0\n\
- bne 1b\n\
- @ shuffle envp down\n\
-1: ldr r5, [r4], #4\n\
- str r5, [r3], #4\n\
- cmp r5, #0\n\
- bne 1b\n\
- @ shuffle auxv down\n\
-1: ldmia r4!, {r0, r5}\n\
- stmia r3!, {r0, r5}\n\
- cmp r0, #0\n\
- bne 1b\n\
- @ Update _dl_argv\n\
- ldr r3, .L_ARGV\n\
- str r2, [sl, r3]\n\
- b .L_done_fixup\n\
\n\
.L_GET_GOT:\n\
.word _GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\
-.L_SKIP_ARGS:\n\
- .word _dl_skip_args(GOTOFF)\n\
.L_FINI_PROC:\n\
.word _dl_fini(GOTOFF)\n\
.L_ARGV:\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 ` Adhemerval Zanella [this message]
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 ` [PATCH 15/17] sparc: " Adhemerval Zanella
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-3-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).