From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 04C1738293C6; Fri, 10 Jun 2022 12:11:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04C1738293C6 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/release/2.35/master] nios2: Remove _dl_skip_args usage (BZ# 29187) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 8468be8433c8c4cc0c17a1811a9b0f439043644a X-Git-Newrev: 9d8ae95604feff154a92e1963d3c08d715407e26 Message-Id: <20220610121135.04C1738293C6@sourceware.org> Date: Fri, 10 Jun 2022 12:11:35 +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: Fri, 10 Jun 2022 12:11:35 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9d8ae95604feff154a92e1963d3c08d715407e26 commit 9d8ae95604feff154a92e1963d3c08d715407e26 Author: Adhemerval Zanella Date: Thu May 26 13:12:21 2022 -0300 nios2: Remove _dl_skip_args usage (BZ# 29187) 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 (cherry picked from commit 4868ba5d257a7fb415674e79c4ae5a3af2827f55) Diff: --- NEWS | 1 + sysdeps/nios2/dl-machine.h | 50 ++++++++++------------------------------------ 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/NEWS b/NEWS index e45144a62e..9b162ca846 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,7 @@ The following bugs are resolved with this release: [29109] libc: posix_spawn() always returns 1 (EPERM) on clone() failure [29165] libc: [Regression] broken argv adjustment + [29187] dynamic-link: [regression] broken argv adjustment for nios2 [29203] libc: daemon is not y2038 aware [29204] libc: getusershell is not 2038 aware [29207] libc: posix_fallocate fallback implementation is not y2038 diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h index 80de6fd041..9a35cf4160 100644 --- a/sysdeps/nios2/dl-machine.h +++ b/sysdeps/nios2/dl-machine.h @@ -128,53 +128,23 @@ _start:\n\ ldw r8, %call(_dl_nios2_get_gp_value)(r22)\n\ callr r8\n\ mov gp, r2\n\ -\n\ - /* Find the number of arguments to skip. */\n\ - ldw r8, %got(_dl_skip_args)(r22)\n\ - ldw r8, 0(r8)\n\ \n\ /* Find the main_map from the GOT. */\n\ ldw r4, %got(_rtld_local)(r22)\n\ ldw r4, 0(r4)\n\ \n\ - /* Find argc. */\n\ - ldw r5, 0(sp)\n\ - sub r5, r5, r8\n\ - stw r5, 0(sp)\n\ -\n\ - /* Find the first unskipped argument. */\n\ - slli r8, r8, 2\n\ - addi r6, sp, 4\n\ - add r9, r6, r8\n\ - mov r10, r6\n\ -\n\ - /* Shuffle argv down. */\n\ -3: ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 4\n\ - addi r10, r10, 4\n\ - bne r11, zero, 3b\n\ + /* Load adjusted argc. */\n\ + ldw r2, %got(_dl_argc)(r22)\n\ + ldw r5, 0(r2)\n\ \n\ - /* Shuffle envp down. */\n\ - mov r7, r10\n\ -4: ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 4\n\ - addi r10, r10, 4\n\ - bne r11, zero, 4b\n\ -\n\ - /* Shuffle auxv down. */\n\ -5: ldw r11, 4(r9)\n\ - stw r11, 4(r10)\n\ - ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 8\n\ - addi r10, r10, 8\n\ - bne r11, zero, 5b\n\ -\n\ - /* Update _dl_argv. */\n\ + /* Load adjsuted argv. */\n\ ldw r2, %got(_dl_argv)(r22)\n\ - stw r6, 0(r2)\n\ + ldw r6, 0(r2)\n\ +\n\ + /* envp = argv + argc + 1 */\n\ + addi r7, r5, 1\n\ + slli r7, r7, 2\n\ + add r7, r7, r6\n\ \n\ /* Call _dl_init through the PLT. */\n\ ldw r8, %call(_dl_init)(r22)\n\