public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] riscv: Remove _dl_skip_args usage
@ 2022-05-30 20:50 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2022-05-30 20:50 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d62123c1ed2506f85a2f17aa195eb682796fd7ed
commit d62123c1ed2506f85a2f17aa195eb682796fd7ed
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu May 26 13:12:44 2022 -0300
riscv: 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 with qemu-user that arguments are correctly passed on both
constructors and main program.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
sysdeps/riscv/dl-machine.h | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sysdeps/riscv/dl-machine.h b/sysdeps/riscv/dl-machine.h
index 4912735c2b..9e026ae011 100644
--- a/sysdeps/riscv/dl-machine.h
+++ b/sysdeps/riscv/dl-machine.h
@@ -107,18 +107,8 @@ elf_machine_dynamic (void)
" _RTLD_PROLOGUE (_dl_start_user) "\
# Stash user entry point in s0.\n\
mv s0, a0\n\
- # See if we were run as a command with the executable file\n\
- # name as an extra leading argument.\n\
- lw a0, _dl_skip_args\n\
- # Load the original argument count.\n\
+ # Load the adjusted argument count.\n\
" STRINGXP (REG_L) " a1, 0(sp)\n\
- # Subtract _dl_skip_args from it.\n\
- sub a1, a1, a0\n\
- # Adjust the stack pointer to skip _dl_skip_args words.\n\
- sll a0, a0, " STRINGXP (PTRLOG) "\n\
- add sp, sp, a0\n\
- # Save back the modified argument count.\n\
- " STRINGXP (REG_S) " a1, 0(sp)\n\
# Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\
" STRINGXP (REG_L) " a0, _rtld_local\n\
add a2, sp, " STRINGXP (SZREG) "\n\
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-30 20:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-30 20:50 [glibc] riscv: Remove _dl_skip_args usage Adhemerval Zanella
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).