From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 76D1E384B126; Mon, 30 May 2022 20:49:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76D1E384B126 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] m68k: Remove _dl_skip_args usage X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 57bb1e5b9fce7f3797bdb3005065187ba9d66c59 X-Git-Newrev: ee39fafa9814f19506524e35a51b3ad4ccbd154e Message-Id: <20220530204941.76D1E384B126@sourceware.org> Date: Mon, 30 May 2022 20:49:41 +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:49:41 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ee39fafa9814f19506524e35a51b3ad4ccbd154e commit ee39fafa9814f19506524e35a51b3ad4ccbd154e Author: Adhemerval Zanella Date: Thu May 26 13:10:38 2022 -0300 m68k: 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/m68k/dl-machine.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index bb51b4198c..64b9fe0b71 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -142,15 +142,8 @@ _start:\n\ _dl_start_user:\n\ | Save the user entry point address in %a4.\n\ move.l %d0, %a4\n\ - | See if we were run as a command with the executable file\n\ - | name as an extra leading argument.\n\ - " PCREL_OP ("move.l", "_dl_skip_args", "%d0", "%d0", "%pc") "\n\ | Pop the original argument count\n\ move.l (%sp)+, %d1\n\ - | Subtract _dl_skip_args from it.\n\ - sub.l %d0, %d1\n\ - | Adjust the stack pointer to skip _dl_skip_args words.\n\ - lea (%sp, %d0*4), %sp\n\ | Push back the modified argument count.\n\ move.l %d1, -(%sp)\n\ # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\