From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id B78483858423 for ; Tue, 14 Dec 2021 22:19:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B78483858423 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Content-Type:From:Reply-To: Subject:Content-ID:Content-Description:X-Debbugs-Cc; bh=9bohtX1vVXfuyDU+ZpwpWwNKMjF3etKOfkbGCUVfi2w=; b=MMKS2oCaqWb+eIgBCTWQw1dg72 gi9ssfAIxUEBIhyp7+V62pb6Vp5dwwJrbPE0IRY66W2yiIiDP33OnzPxM/gfSkelGiR5aB/RBT8Ij rZwT20xdV+lkbzGKSTTsRusmOT5+pC64QB7XRB+0eb5D+Bckzf3/fUdJqJPpnuezELdaf+p8ZcUXK rEq20ddljOf2JnN/6F6Tb6Chy1JDRKtMT7n1jS6ri50gPE18lO/eAGQMzkvlF9AMmdH6l1QJOz4EM yfSXjFThEhXptaannMJoovyo9SmXd5Me3Zw3bxN3c2WqAk1pjkwStznVBFr4RFXG7UMS/O3sudQCD PYIbvSRA==; Received: from [2a01:e34:ec5d:a741:8a4c:7c4e:dc4c:1787] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mxG8q-0006ca-Ug; Tue, 14 Dec 2021 23:19:24 +0100 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.95) (envelope-from ) id 1mxG8q-0014fH-CN; Tue, 14 Dec 2021 23:19:24 +0100 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Xi Ruoyao Subject: [COMMITTED 2.34 2/2] mips: increase stack alignment in clone to match the ABI Date: Tue, 14 Dec 2021 23:19:19 +0100 Message-Id: <20211214221919.256237-2-aurelien@aurel32.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211214221919.256237-1-aurelien@aurel32.net> References: <20211214221919.256237-1-aurelien@aurel32.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2021 22:19:27 -0000 From: Xi Ruoyao In "mips: align stack in clone [BZ #28223]" (commit 1f51cd9a860ee45eee8a56fb2ba925267a2a7bfe) I made a mistake: I misbelieved one "word" was 2-byte and "doubleword" should be 4-byte. But in MIPS ABI one "word" is defined 32-bit (4-byte), so "doubleword" is 8-byte [1], and "quadword" is 16-byte [2]. [1]: "System V Application Binary Interface: MIPS(R) RISC Processor Supplement, 3rd edition", page 3-31 [2]: "MIPSpro(TM) 64-Bit Porting and Transition Guide", page 23 (cherry picked from commit 0f62fe053273ff6c62ac95c59b7687c964737b00) --- sysdeps/unix/sysv/linux/mips/clone.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S index 43a5ad3a40..fd71b5ca2e 100644 --- a/sysdeps/unix/sysv/linux/mips/clone.S +++ b/sysdeps/unix/sysv/linux/mips/clone.S @@ -55,11 +55,11 @@ NESTED(__clone,4*SZREG,sp) .set at #endif - /* Align stack to 4/8 bytes per the ABI. */ + /* Align stack to 8/16 bytes per the ABI. */ #if _MIPS_SIM == _ABIO32 - li t0,-4 -#else li t0,-8 +#else + li t0,-16 #endif and a1,a1,t0 -- 2.33.0