diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2017-03-20 04:47:56 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-03-20 10:56:52 -0400 |
| commit | d1d39a2ed04e50503676bcf3e4a17080ccd5487b (patch) | |
| tree | 4c8a065fb6d2a739c6148d5e7a25d0c23812973e | |
| parent | 764c430aa0c6af6181d5834bcb20d8ea99562992 (diff) | |
| download | glibc-gentoo/2.24.tar.gz | |
posix_spawn: fix stack setup on ia64 [BZ #21275]gentoo/2.24
The ia64-specific clone2 call expects the base of the stack mapping and
the stack size as sep arguments, not an initial stack value as on other
stack-grows-down architectures. Reuse the stack-grows-up macro so we
pass in the right stack base.
Reported-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit ddc3fb333469c2997798742dc0509dc1e3201d91)
(cherry picked from commit 7043946c7921c0e3850dd2b3d948336624bb0f62)
| -rw-r--r-- | sysdeps/unix/sysv/linux/spawni.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index 67e1c42426..c946120c34 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -59,17 +59,18 @@ #define SPAWN_ERROR 127 #ifdef __ia64__ -# define CLONE(__fn, __stack, __stacksize, __flags, __args) \ - __clone2 (__fn, __stack, __stacksize, __flags, __args, 0, 0, 0) +# define CLONE(__fn, __stackbase, __stacksize, __flags, __args) \ + __clone2 (__fn, __stackbase, __stacksize, __flags, __args, 0, 0, 0) #else # define CLONE(__fn, __stack, __stacksize, __flags, __args) \ __clone (__fn, __stack, __flags, __args) #endif -#if _STACK_GROWS_DOWN -# define STACK(__stack, __stack_size) (__stack + __stack_size) -#elif _STACK_GROWS_UP +/* Since ia64 wants the stackbase w/clone2, re-use the grows-up macro. */ +#if _STACK_GROWS_UP || defined (__ia64__) # define STACK(__stack, __stack_size) (__stack) +#elif _STACK_GROWS_DOWN +# define STACK(__stack, __stack_size) (__stack + __stack_size) #endif |