From patchwork Thu May 26 16:49:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54411 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE9583857350 for ; Thu, 26 May 2022 16:51:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE9583857350 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653583914; bh=63aRecK8MU2YPraF6VBttloiJVnJsxcFR3sF05HLeXw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sGI4kWxqaQ5SBU9xIwo1YHMYRZbcvTrKFWguV8JKl+kb1lmsEzrAJ5lAYRMcFSidL +qHWz9qQXQYFlRBs02kywVqrW3QmAq5b2LwPuSg5grjjiv/d3gh4IGOvvdUGOhiFYG TWHQKi7lXBVkR0t9KEv9GdBP4V2AesSmUr5cSTsM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by sourceware.org (Postfix) with ESMTPS id BB0A838376ED for ; Thu, 26 May 2022 16:50:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BB0A838376ED Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-f2bb84f9edso2827045fac.10 for ; Thu, 26 May 2022 09:50:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=63aRecK8MU2YPraF6VBttloiJVnJsxcFR3sF05HLeXw=; b=h4ALy66uwDyICg2ba81+kckvs3ih4sXZ4Z8nArkl/dn94202opV/6yttH4YXOHXH7+ XsW4WU3knphVBIHXtXNYa/q+wMNQcG5JX6FR1k0L+gvWgmfVr6/RWSruBJ6cZFuaGBTu nuflTOA5g+Z6dcGoXFQnkffjesFatzXoBuvYNDWWtZAejHgnvtigxBIJ5bV5ZNyFkkhT bzxSFfNBlkAFWM0cwF5WqXiKeT3wpZ1TozOizf48ygD+zbNNYiRYGs3OwacO0yBeYs4x kqdILqENdJ0+XXfcn39d9hURDSO3/dkiOsnbMkVco6wj431StbCnPKpbj61CYFPRkImp b3mg== X-Gm-Message-State: AOAM533bBm0Whd73d6diu0b5In8t5IlkZv+L4hXm5UxUOQXnrZ3P0A+c JGgu/eCbxzNPn8hwecYJwfCs15WRq9ul2w== X-Google-Smtp-Source: ABdhPJy7cf+kn4ri/UZDHlJbr8E+p1nkzmVu8xV43Nxh+jxVyM9+nUYHakTCCSWioYWmFxa9KlY8lg== X-Received: by 2002:a05:6870:ecac:b0:f2:c445:482a with SMTP id eo44-20020a056870ecac00b000f2c445482amr1760961oab.60.1653583810826; Thu, 26 May 2022 09:50:10 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:9f85:b1e1:5370:63bd:a2ac]) by smtp.gmail.com with ESMTPSA id y26-20020a9d461a000000b0060603221255sm802521ote.37.2022.05.26.09.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:50:10 -0700 (PDT) To: libc-alpha@sourceware.org, Szabolcs Nagy Subject: [PATCH 02/17] arm: Remove _dl_skip_args usage Date: Thu, 26 May 2022 13:49:48 -0300 Message-Id: <20220526165003.705355-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220526165003.705355-1-adhemerval.zanella@linaro.org> References: <20220526165003.705355-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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. It makes the _fixup_stack branch ununsed. Checked with qemu-user that arguments are correctly passed on both constructors and main program. --- sysdeps/arm/dl-machine.h | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 2a7f795e46..6a422713bd 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -130,9 +130,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], _start:\n\ @ we are PIC code, so get global offset table\n\ ldr sl, .L_GET_GOT\n\ - @ See if we were run as a command with the executable file\n\ - @ name as an extra leading argument.\n\ - ldr r4, .L_SKIP_ARGS\n\ @ at start time, all the args are on the stack\n\ mov r0, sp\n\ bl _dl_start\n\ @@ -147,10 +144,6 @@ _dl_start_user:\n\ ldr r1, [sp]\n\ @ get the argv address\n\ add r2, sp, #4\n\ - @ Fix up the stack if necessary.\n\ - cmp r4, #0\n\ - bne .L_fixup_stack\n\ -.L_done_fixup:\n\ @ compute envp\n\ add r3, r2, r1, lsl #2\n\ add r3, r3, #4\n\ @@ -164,41 +157,9 @@ _dl_start_user:\n\ add r0, sl, r0\n\ @ jump to the user_s entry point\n\ " BX(r6) "\n\ -\n\ - @ iWMMXt and EABI targets require the stack to be eight byte\n\ - @ aligned - shuffle arguments etc.\n\ -.L_fixup_stack:\n\ - @ subtract _dl_skip_args from original arg count\n\ - sub r1, r1, r4\n\ - @ store the new argc in the new stack location\n\ - str r1, [sp]\n\ - @ find the first unskipped argument\n\ - mov r3, r2\n\ - add r4, r2, r4, lsl #2\n\ - @ shuffle argv down\n\ -1: ldr r5, [r4], #4\n\ - str r5, [r3], #4\n\ - cmp r5, #0\n\ - bne 1b\n\ - @ shuffle envp down\n\ -1: ldr r5, [r4], #4\n\ - str r5, [r3], #4\n\ - cmp r5, #0\n\ - bne 1b\n\ - @ shuffle auxv down\n\ -1: ldmia r4!, {r0, r5}\n\ - stmia r3!, {r0, r5}\n\ - cmp r0, #0\n\ - bne 1b\n\ - @ Update _dl_argv\n\ - ldr r3, .L_ARGV\n\ - str r2, [sl, r3]\n\ - b .L_done_fixup\n\ \n\ .L_GET_GOT:\n\ .word _GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\ -.L_SKIP_ARGS:\n\ - .word _dl_skip_args(GOTOFF)\n\ .L_FINI_PROC:\n\ .word _dl_fini(GOTOFF)\n\ .L_ARGV:\n\