public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Szabolcs Nagy <Szabolcs.Nagy@arm.com>
Subject: [PATCH 03/17] arc: Remove _dl_skip_args usage
Date: Thu, 26 May 2022 13:49:49 -0300	[thread overview]
Message-ID: <20220526165003.705355-4-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.
---
 sysdeps/arc/dl-machine.h | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h
index 4ac3848557..c6ad232384 100644
--- a/sysdeps/arc/dl-machine.h
+++ b/sysdeps/arc/dl-machine.h
@@ -161,29 +161,16 @@ __start:								\n\
 	bl.d    _dl_start                                       	\n\
 	mov_s   r0, sp  /* pass ptr to aux vector tbl.    */    	\n\
 	mov r13, r0	/* safekeep app elf entry point.  */		\n\
-									\n\
-	/* (2). If ldso ran with executable as arg.       */		\n\
-	/*      skip the extra args calc by dl_start.     */		\n\
 	ld_s    r1, [sp]       /* orig argc.  */			\n\
-	ld      r12, [pcl, _dl_skip_args@pcl]                   	\n\
-	breq	r12, 0, 1f						\n\
 									\n\
-	add2    sp, sp, r12 /* discard argv entries from stack.  */	\n\
-	sub_s   r1, r1, r12 /* adjusted argc on stack.  */      	\n\
-	st_s    r1, [sp]                                        	\n\
-	add	r2, sp, 4						\n\
-	/* intermediate LD for ST emcoding limitations.  */		\n\
-	ld	r3, [pcl, _dl_argv@gotpc]    				\n\
-	st	r2, [r3]						\n\
-1:									\n\
-	/* (3). call preinit stuff.  */					\n\
+	/* (2). call preinit stuff.  */					\n\
 	ld	r0, [pcl, _rtld_local@pcl]				\n\
 	add	r2, sp, 4	; argv					\n\
 	add2	r3, r2, r1						\n\
 	add	r3, r3, 4	; env					\n\
 	bl	_dl_init@plt						\n\
 									\n\
-	/* (4) call app elf entry point.  */				\n\
+	/* (3) call app elf entry point.  */				\n\
 	add     r0, pcl, _dl_fini@pcl					\n\
 	j	[r13]							\n\
 									\n\
-- 
2.34.1


  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 ` Adhemerval Zanella [this message]
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-4-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).