lib/glibc
lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-06-02 02:01:46 +03:00
Code

s390x: Align child stack while clone. [BZ #27968]

Browse Source 
Starting with recent commit 92a7d1343991897f77afe01041f3b77712445e47
"x86-64: Align child stack to 16 bytes [BZ #27902]"
the new test misc/tst-misalign-clone has failed on s390x/s390.

This patch is now aligning the stack to a double
word boundary as also done in start.S files.
This commit is contained in:
Stefan Liebler 2021-06-08 15:37:32 +02:00
parent 088d3291ef
commit dbdc57dc81
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/unix/sysv/linux/s390/s390-32/clone.S
View File

@ -33,11 +33,13 @@
ENTRY(__clone) ENTRY(__clone)
st %r6,24(%r15) /* store %r6 to save area */ st %r6,24(%r15) /* store %r6 to save area */
cfi_offset (%r6, -72) cfi_offset (%r6, -72)
lr %r0,%r5 /* move *arg out of the way */
ltr %r1,%r2 /* check fn and move to %r1 */ ltr %r1,%r2 /* check fn and move to %r1 */
jz error /* no NULL function pointers */ jz error /* no NULL function pointers */
ltr %r2,%r3 /* check child_stack and move to %r2 */ lhi %r0,-8 /* Align the child_stack to a ... */
jz error /* no NULL stack pointers */ nr %r3,%r0 /* double word boundary and ... */
jz error /* avoid NULL stack pointers. */
lr %r0,%r5 /* move *arg out of the way */
lr %r2,%r3 /* move child_stack to %r2 */
lr %r3,%r4 /* move flags to %r3 */ lr %r3,%r4 /* move flags to %r3 */
lr %r4,%r6 /* move parent_tid to %r4 */ lr %r4,%r6 /* move parent_tid to %r4 */
l %r5,100(%r15) /* load child_tid from stack */ l %r5,100(%r15) /* load child_tid from stack */

8
sysdeps/unix/sysv/linux/s390/s390-64/clone.S
View File

@ -34,11 +34,13 @@
ENTRY(__clone) ENTRY(__clone)
stg %r6,48(%r15) /* store %r6 to save area */ stg %r6,48(%r15) /* store %r6 to save area */
cfi_offset (%r6,-112) cfi_offset (%r6,-112)
lgr %r0,%r5 /* move *arg out of the way */
ltgr %r1,%r2 /* check fn and move to %r1 */ ltgr %r1,%r2 /* check fn and move to %r1 */
jz error /* no NULL function pointers */ jz error /* no NULL function pointers */
ltgr %r2,%r3 /* check child_stack and move to %r2 */ lghi %r0,-16 /* Align the child_stack to a ... */
jz error /* no NULL stack pointers */ ngr %r3,%r0 /* double word boundary and ... */
jz error /* avoid NULL stack pointers. */
lgr %r0,%r5 /* move *arg out of the way */
lgr %r2,%r3 /* move child_stack to %r2 */
lgr %r3,%r4 /* move flags to %r3 */ lgr %r3,%r4 /* move flags to %r3 */
lgr %r4,%r6 /* move parent_tid to %r4 */ lgr %r4,%r6 /* move parent_tid to %r4 */
lg %r5,168(%r15) /* load child_tid from stack */ lg %r5,168(%r15) /* load child_tid from stack */