From patchwork Thu May 26 16:50:01 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: 54424 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 4F9123836E6F for ; Thu, 26 May 2022 17:01:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F9123836E6F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653584479; bh=/htUQSz7EeRt8AY/+tsT2g54P52cwaCpX9nAh1mBwKw=; 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=FTEq/3Lr3hAEz/2cYq1gZlFU7emFl9DG9Z54j4LGNc+p3pDxh/MiIbLL/r03uq9Gq g8m/hAQxhja7gu5SvRt/vISD8YifoUPL219NXdtWPz0Rw/bvI7vwl4Rg03swhyL/2d Mx3mDcoXJoTTP5hVf69f++UUZSDxHrqjNRl01LOs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 0735B3857357 for ; Thu, 26 May 2022 16:50:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0735B3857357 Received: by mail-ot1-x335.google.com with SMTP id l9-20020a056830268900b006054381dd35so1333913otu.4 for ; Thu, 26 May 2022 09:50:31 -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=/htUQSz7EeRt8AY/+tsT2g54P52cwaCpX9nAh1mBwKw=; b=I0MWMB/sQy/ZWKUavc5/k377njKiOhStVAanyUu9oghJLuP2/1rIWjlfZg7BrREJbr dHVOmNkSsMKwil6X3sjHIGGiJnQlnZP6Sra7UPAWhdRccW8uGGdhQLRJXc1+Le+lYunJ G4ahm+oOZdSriD0e/YwZmLdy7wK+jSFCtbN4yTgKgGC7rM+tvNNrMH9nJBAGYd7Psttb byaHgmq9rO99ZUQgC/enYCzKjBYS/sAP0FewKHSV1jOQLcu5wIondh3Yd1UpVY0yoxHD VpAm5FmZrebV5z04yOIjunQI2mK0UhuXdYSefe+L8lMmR1mywvbLy7TpMnJozPabe9zm 6yJA== X-Gm-Message-State: AOAM532IIcKOuCroslaGkrnTDsxHNMA+ulej64BMV0s3/0AhyyJIdiqS c8nb5gtRdE+xdU3ENgCPn6AweboshKlDRg== X-Google-Smtp-Source: ABdhPJwzLqleudyMnyNj21GQ1ow3msKXAu/yzD4fdt4tIlfA0fPhtfXv5JM7UBhyq8CkPhqj5T9HfA== X-Received: by 2002:a05:6830:1005:b0:60b:1844:cce2 with SMTP id a5-20020a056830100500b0060b1844cce2mr7976570otp.305.1653583830063; Thu, 26 May 2022 09:50:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:50:29 -0700 (PDT) To: libc-alpha@sourceware.org, Szabolcs Nagy Subject: [PATCH 15/17] sparc: Remove _dl_skip_args usage Date: Thu, 26 May 2022 13:50:01 -0300 Message-Id: <20220526165003.705355-16-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.8 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. So there is no need to adjust the argc or argv. Checked on sparc64-linux-gnu and sparcv9-linux-gnu. --- sysdeps/sparc/sparc32/dl-machine.h | 43 ++---------------------------- sysdeps/sparc/sparc64/dl-machine.h | 40 ++------------------------- 2 files changed, 4 insertions(+), 79 deletions(-) diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 8c2408b1e6..8baf45be52 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -196,48 +196,9 @@ _dl_start_user:\n\ add %l7, %o7, %l7\n\ /* Save the user entry point address in %l0 */\n\ mov %o0, %l0\n\ - /* See if we were run as a command with the executable file name as an\n\ - extra leading argument. If so, adjust the contents of the stack. */\n\ - " RTLD_GOT_ADDRESS(%l7, %g2, _dl_skip_args) "\n\ - ld [%g2], %i0\n\ - tst %i0\n\ - beq 3f\n\ - ld [%sp+22*4], %i5 /* load argc */\n\ - /* Find out how far to shift. */\n\ - " RTLD_GOT_ADDRESS(%l7, %l3, _dl_argv) "\n\ - sub %i5, %i0, %i5\n\ - ld [%l3], %l4\n\ - sll %i0, 2, %i2\n\ - st %i5, [%sp+22*4]\n\ - sub %l4, %i2, %l4\n\ - add %sp, 23*4, %i1\n\ - add %i1, %i2, %i2\n\ - st %l4, [%l3]\n\ - /* Copy down argv */\n\ -21: ld [%i2], %i3\n\ - add %i2, 4, %i2\n\ - tst %i3\n\ - st %i3, [%i1]\n\ - bne 21b\n\ - add %i1, 4, %i1\n\ - /* Copy down env */\n\ -22: ld [%i2], %i3\n\ - add %i2, 4, %i2\n\ - tst %i3\n\ - st %i3, [%i1]\n\ - bne 22b\n\ - add %i1, 4, %i1\n\ - /* Copy down auxiliary table. */\n\ -23: ld [%i2], %i3\n\ - ld [%i2+4], %i4\n\ - add %i2, 8, %i2\n\ - tst %i3\n\ - st %i3, [%i1]\n\ - st %i4, [%i1+4]\n\ - bne 23b\n\ - add %i1, 8, %i1\n\ + ld [%sp+22*4], %i5 /* load argc */\n\ /* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */\n\ -3: " RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) "\n\ + " RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) "\n\ add %sp, 23*4, %o2\n\ sll %i5, 2, %o3\n\ add %o3, 4, %o3\n\ diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 8c4bab14fc..d34d9aa470 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -245,45 +245,9 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], " add %l7, %o7, %l7\n" \ " /* Save the user entry point address in %l0. */\n" \ " mov %o0, %l0\n" \ -" /* See if we were run as a command with the executable file name as an\n" \ -" extra leading argument. If so, we must shift things around since we\n" \ -" must keep the stack doubleword aligned. */\n" \ - RTLD_GOT_ADDRESS(%l7, %g5, _dl_skip_args) \ -" ld [%g5], %i0\n" \ -" brz,pt %i0, 2f\n" \ -" ldx [%sp + " __S(STACK_BIAS) " + 22*8], %i5\n" \ -" /* Find out how far to shift. */\n" \ -" sub %i5, %i0, %i5\n" \ -" sllx %i0, 3, %l6\n" \ - RTLD_GOT_ADDRESS(%l7, %l4, _dl_argv) \ -" stx %i5, [%sp + " __S(STACK_BIAS) " + 22*8]\n" \ -" add %sp, " __S(STACK_BIAS) " + 23*8, %i1\n" \ -" add %i1, %l6, %i2\n" \ -" ldx [%l4], %l5\n" \ -" /* Copy down argv. */\n" \ -"12: ldx [%i2], %i3\n" \ -" add %i2, 8, %i2\n" \ -" stx %i3, [%i1]\n" \ -" brnz,pt %i3, 12b\n" \ -" add %i1, 8, %i1\n" \ -" sub %l5, %l6, %l5\n" \ -" /* Copy down envp. */\n" \ -"13: ldx [%i2], %i3\n" \ -" add %i2, 8, %i2\n" \ -" stx %i3, [%i1]\n" \ -" brnz,pt %i3, 13b\n" \ -" add %i1, 8, %i1\n" \ -" /* Copy down auxiliary table. */\n" \ -"14: ldx [%i2], %i3\n" \ -" ldx [%i2 + 8], %i4\n" \ -" add %i2, 16, %i2\n" \ -" stx %i3, [%i1]\n" \ -" stx %i4, [%i1 + 8]\n" \ -" brnz,pt %i3, 14b\n" \ -" add %i1, 16, %i1\n" \ -" stx %l5, [%l4]\n" \ +" ldx [%sp + " __S(STACK_BIAS) " + 22*8], %i5\n" \ " /* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */\n" \ -"2:\t" RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) \ +"" RTLD_GOT_ADDRESS(%l7, %o0, _rtld_local) \ " sllx %i5, 3, %o3\n" \ " add %sp, " __S(STACK_BIAS) " + 23*8, %o2\n" \ " add %o3, 8, %o3\n" \