diff options
| author |   John David Anglin <danglin@gcc.gnu.org> | 2019-11-03 16:28:01 -0500 |
|---|---|---|
| committer |   Andreas K. Huettel <dilfridge@gentoo.org> | 2020-03-09 11:48:24 +0100 |
| commit | 1cbd8e4546389dd8e9d70af4da1e24d5786ad04b (patch) | |
| tree | 2205fcff07789ecc1270285706a9542bfd35af99 | |
| parent | Remove incorrect alloc_size attribute from pvalloc [BZ #25401] (diff) | |
| download | glibc-1cbd8e4546389dd8e9d70af4da1e24d5786ad04b.tar.gz glibc-1cbd8e4546389dd8e9d70af4da1e24d5786ad04b.tar.bz2 glibc-1cbd8e4546389dd8e9d70af4da1e24d5786ad04b.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.
(cherry picked from commit e4c23a029a54c8c7788eff9ca771a01cccaaa0ce)
(cherry picked from commit 43598ef6e2b1a8226db9f83dac9e93224306e242)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/clone.S | 9 |
2 files changed, 8 insertions, 2 deletions
@@ -28,6 +28,7 @@ The following bugs are resolved with this release: unconditionally [24899] login: Add nonstring attributes to struct utmp, struct utmpx [24902] login: pututxline could fail to overwrite existing entries + [25066] FAIL: nptl/tst-tls1 on hppa [25189] Don't use a custom wrapper macro around __has_include [25203] libio: Disable vtable validation for pre-2.1 interposed handles [25204] Ignore LD_PREFER_MAP_32BIT_EXEC for SUID programs diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S index 79fa4f6147..1c0325e199 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 */ |