93dc2d
commit 4db172a54d43f9b7fd17e66fc44a34efb3cab1e1
93dc2d
Author: Xi Ruoyao <xry111@mengyan1223.wang>
93dc2d
Date:   Fri Aug 13 16:01:14 2021 +0000
93dc2d
93dc2d
    mips: increase stack alignment in clone to match the ABI
93dc2d
    
93dc2d
    In "mips: align stack in clone [BZ #28223]"
93dc2d
    (commit 1f51cd9a860ee45eee8a56fb2ba925267a2a7bfe) I made a mistake: I
93dc2d
    misbelieved one "word" was 2-byte and "doubleword" should be 4-byte.
93dc2d
    But in MIPS ABI one "word" is defined 32-bit (4-byte), so "doubleword" is
93dc2d
    8-byte [1], and "quadword" is 16-byte [2].
93dc2d
    
93dc2d
    [1]: "System V Application Binary Interface: MIPS(R) RISC Processor
93dc2d
          Supplement, 3rd edition", page 3-31
93dc2d
    [2]: "MIPSpro(TM) 64-Bit Porting and Transition Guide", page 23
93dc2d
    
93dc2d
    (cherry picked from commit 0f62fe053273ff6c62ac95c59b7687c964737b00)
93dc2d
93dc2d
diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S
93dc2d
index 43a5ad3a400d9504..fd71b5ca2eb86089 100644
93dc2d
--- a/sysdeps/unix/sysv/linux/mips/clone.S
93dc2d
+++ b/sysdeps/unix/sysv/linux/mips/clone.S
93dc2d
@@ -55,11 +55,11 @@ NESTED(__clone,4*SZREG,sp)
93dc2d
 	.set		at
93dc2d
 #endif
93dc2d
 
93dc2d
-	/* Align stack to 4/8 bytes per the ABI.  */
93dc2d
+	/* Align stack to 8/16 bytes per the ABI.  */
93dc2d
 #if _MIPS_SIM == _ABIO32
93dc2d
-	li		t0,-4
93dc2d
-#else
93dc2d
 	li		t0,-8
93dc2d
+#else
93dc2d
+	li		t0,-16
93dc2d
 #endif
93dc2d
 	and		a1,a1,t0
93dc2d