about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorJohn David Anglin <danglin@gcc.gnu.org>2019-11-03 16:28:01 -0500
committerJohn David Anglin <danglin@gcc.gnu.org>2019-11-03 16:28:01 -0500
commite4c23a029a54c8c7788eff9ca771a01cccaaa0ce (patch)
tree3f7a5e11f4b05e5010e0f82d87cae45ed99fe19b /sysdeps/unix
parent42893aa38fd6041d349ea0427c4d5ccbacd9a2be (diff)
downloadglibc-e4c23a029a54c8c7788eff9ca771a01cccaaa0ce.tar.gz
glibc-e4c23a029a54c8c7788eff9ca771a01cccaaa0ce.tar.xz
glibc-e4c23a029a54c8c7788eff9ca771a01cccaaa0ce.zip
hppa: Align __clone stack argument to 8 bytes (Bug 25066)
The hppa architecture requires strict alignment for loads and stores.
As a result, the minimum stack alignment that will work is 8 bytes.
This patch adjusts __clone() to align the stack argument passed to it.
It also adjusts slightly some formatting.

This fixes the nptl/tst-tls1 test.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/hppa/clone.S9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 6db2cb5dd5..372d29a838 100644
--- a/sysdeps/unix/sysv/linux/hppa/clone.S
+++ b/sysdeps/unix/sysv/linux/hppa/clone.S
@@ -73,13 +73,18 @@ ENTRY(__clone)
 #endif
 
 	/* Sanity check arguments.  */
-	comib,=,n  0, %arg0, .LerrorSanity        /* no NULL function pointers */
-	comib,=,n  0, %arg1, .LerrorSanity        /* no NULL stack pointers */
+	comib,=,n	0,%arg0,.LerrorSanity	/* no NULL function pointers */
+	comib,=,n	0,%arg1,.LerrorSanity	/* no NULL stack pointers */
+
+	/* Ensure stack argument is 8-byte aligned.  */
+	ldo		7(%r25),%r25
+	depi		0,31,3,%r25
 
 	/* Save the function pointer, arg, and flags on the new stack.  */
 	stwm    %r26, 64(%r25)
 	stw	%r23, -60(%r25)
 	stw     %r24, -56(%r25)
+
 	/* Clone arguments are (int flags, void * child_stack) */
 	copy	%r24, %r26		/* flags are first */
 	/* User stack pointer is in the correct register already */