posix_spawn: fix stack setup on ia64 [BZ #21275]
Commit Message
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>
---
sysdeps/unix/sysv/linux/spawni.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Comments
LGTM.
On 20/03/2017 05:49, Mike Frysinger wrote:
> 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>
> ---
> sysdeps/unix/sysv/linux/spawni.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c
> index 6862bee34024..62e168cc04c3 100644
> --- a/sysdeps/unix/sysv/linux/spawni.c
> +++ b/sysdeps/unix/sysv/linux/spawni.c
> @@ -61,17 +61,17 @@
> #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
> +#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
>
>
>
@@ -61,17 +61,17 @@
#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
+#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