[COMMITTED] support: Fix xclone build failures on ia64 and hppa

Message ID 87czsaic6v.fsf@oldenburg.str.redhat.com
State Committed
Commit 97ed4749becdc20481688ee074e90507ca3501dd
Headers
Series [COMMITTED] support: Fix xclone build failures on ia64 and hppa |

Commit Message

Florian Weimer June 25, 2021, 8:24 a.m. UTC
  ---
 support/xclone.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
  

Comments

Adhemerval Zanella June 25, 2021, 12:37 p.m. UTC | #1
On 25/06/2021 05:24, Florian Weimer via Libc-alpha wrote:
> ---
>  support/xclone.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/support/xclone.c b/support/xclone.c
> index 924d2b8754..243eee8b23 100644
> --- a/support/xclone.c
> +++ b/support/xclone.c
> @@ -30,15 +30,14 @@ xclone (int (*fn) (void *arg), void *arg, void *stack, size_t stack_size,
>  # ifdef __ia64__
>    extern int __clone2 (int (*fn) (void *arg), void *stack, size_t stack_size,
>  		       int flags, void *arg, ...);
> -  r = __clone2 (f, stack, stack_size, flags, arg, /* ptid */ NULL,
> -		/* tls */ NULL, /* ctid  */ ctid);
> +  r = __clone2 (fn, stack, stack_size, flags, arg, /* ptid */ NULL,
> +		/* tls */ NULL, /* ctid  */ NULL);
>  # else
>  #  if _STACK_GROWS_DOWN
>    r = clone (fn, stack + stack_size, flags, arg, /* ptid */ NULL,
>  	     /* tls */ NULL, /* ctid */  NULL);
>  #  elif _STACK_GROWS_UP
> -  r = clone (fn, stack, flags, arg, /* ptid */ NULL, /* tls */ NULL,
> -	     &ctid);
> +  r = clone (fn, stack, flags, arg, /* ptid */ NULL, /* tls */ NULL, NULL);
>  #  endif
>  # endif

Thanks for catching it.
  

Patch

diff --git a/support/xclone.c b/support/xclone.c
index 924d2b8754..243eee8b23 100644
--- a/support/xclone.c
+++ b/support/xclone.c
@@ -30,15 +30,14 @@  xclone (int (*fn) (void *arg), void *arg, void *stack, size_t stack_size,
 # ifdef __ia64__
   extern int __clone2 (int (*fn) (void *arg), void *stack, size_t stack_size,
 		       int flags, void *arg, ...);
-  r = __clone2 (f, stack, stack_size, flags, arg, /* ptid */ NULL,
-		/* tls */ NULL, /* ctid  */ ctid);
+  r = __clone2 (fn, stack, stack_size, flags, arg, /* ptid */ NULL,
+		/* tls */ NULL, /* ctid  */ NULL);
 # else
 #  if _STACK_GROWS_DOWN
   r = clone (fn, stack + stack_size, flags, arg, /* ptid */ NULL,
 	     /* tls */ NULL, /* ctid */  NULL);
 #  elif _STACK_GROWS_UP
-  r = clone (fn, stack, flags, arg, /* ptid */ NULL, /* tls */ NULL,
-	     &ctid);
+  r = clone (fn, stack, flags, arg, /* ptid */ NULL, /* tls */ NULL, NULL);
 #  endif
 # endif