From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id E316E384B124; Mon, 30 May 2022 20:50:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E316E384B124 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] riscv: Remove _dl_skip_args usage X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 4868ba5d257a7fb415674e79c4ae5a3af2827f55 X-Git-Newrev: d62123c1ed2506f85a2f17aa195eb682796fd7ed Message-Id: <20220530205001.E316E384B124@sourceware.org> Date: Mon, 30 May 2022 20:50:01 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 20:50:02 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d62123c1ed2506f85a2f17aa195eb682796fd7ed commit d62123c1ed2506f85a2f17aa195eb682796fd7ed Author: Adhemerval Zanella 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 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\