public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] mips: Remove _dl_skip_args usage
Date: Mon, 30 May 2022 20:49:51 +0000 (GMT)	[thread overview]
Message-ID: <20220530204951.AD245384B126@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=44fc092c0d86e5ff44c5eeff20934dd8c0b645fa

commit 44fc092c0d86e5ff44c5eeff20934dd8c0b645fa
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu May 26 13:11:58 2022 -0300

    mips: 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/mips/dl-machine.h | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 9105b5b75c..b68066d430 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -278,20 +278,7 @@ do {									\
 	move $16, $28\n\
 	# Save the user entry point address in a saved register.\n\
 	move $17, $2\n\
-	# See if we were run as a command with the executable file\n\
-	# name as an extra leading argument.\n\
-	lw $2, _dl_skip_args\n\
-	beq $2, $0, 1f\n\
-	# Load the original argument count.\n\
-	" STRINGXP(PTR_L) " $4, 0($29)\n\
-	# Subtract _dl_skip_args from it.\n\
-	subu $4, $2\n\
-	# Adjust the stack pointer to skip _dl_skip_args words.\n\
-	sll $2, " STRINGXP (PTRLOG) "\n\
-	" STRINGXP(PTR_ADDU) " $29, $2\n\
-	# Save back the modified argument count.\n\
-	" STRINGXP(PTR_S) " $4, 0($29)\n\
-1:	# Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\
+	# Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\
 	" STRINGXP(PTR_L) " $4, _rtld_local\n\
 	" STRINGXP(PTR_L) /* or lw???  fixme */ " $5, 0($29)\n\
 	" STRINGXP(PTR_LA) " $6, " STRINGXP (PTRSIZE) "($29)\n\
@@ -352,21 +339,7 @@ do {									\
 	addu $16, $4\n\
 	move $17, $2\n\
 	move $28, $16\n\
-	lw $4, %got(_dl_skip_args)($16)\n\
-	lw $4, 0($4)\n\
-	beqz $4, 1f\n\
-	# Load the original argument count.\n\
-	lw $5, 0($sp)\n\
-	# Subtract _dl_skip_args from it.\n\
-	subu $5, $4\n\
-	# Adjust the stack pointer to skip _dl_skip_args words.\n\
-	sll $4, " STRINGXP (PTRLOG) "\n\
-	move $6, $sp\n\
-	addu $6, $4\n\
-	move $sp, $6\n\
-	# Save back the modified argument count.\n\
-	sw $5, 0($sp)\n\
-1:	# Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\
+	# Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\
 	lw $4, %got(_rtld_local)($16)\n\
 	lw $4, 0($4)\n\
 	lw $5, 0($sp)\n\


                 reply	other threads:[~2022-05-30 20:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220530204951.AD245384B126@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@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).