[RESEND PATCH] arch/csky: Fix the compile error when use abiv1

Dmitry V. Levin ldv at altlinux.org
Tue Feb 11 08:37:02 UTC 2020


On Mon, Feb 10, 2020 at 02:59:48PM +0800, Ma Jun wrote:
> From: MaJun <majun258 at linux.alibaba.com>
> 
> Fix the bug caused by csky_regs. Because this struct
> has no member r1, only a1.
> 
> Signed-off-by: Ma Jun <majun258 at linux.alibaba.com>
> ---
>  linux/csky/get_scno.c | 2 +-
>  linux/csky/set_scno.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/linux/csky/get_scno.c b/linux/csky/get_scno.c
> index 9efb202..9d4397a 100644
> --- a/linux/csky/get_scno.c
> +++ b/linux/csky/get_scno.c
> @@ -12,7 +12,7 @@ arch_get_scno(struct tcb *tcp)
>  #if defined(__CSKYABIV2__)
>  	tcp->scno = csky_regs.regs[3];
>  #else
> -	tcp->scno = csky_regs.r1;
> +	tcp->scno = csky_regs.a1;
>  #endif
>  	return 1;
>  }
> diff --git a/linux/csky/set_scno.c b/linux/csky/set_scno.c
> index 655d108..c1e1c18 100644
> --- a/linux/csky/set_scno.c
> +++ b/linux/csky/set_scno.c
> @@ -13,7 +13,7 @@ arch_set_scno(struct tcb *tcp, kernel_ulong_t scno)
>  #if defined(__CSKYABIV2__)
>  	csky_regs.regs[3] = scno;
>  #else
> -	csky_regs.r1 = scno;
> +	csky_regs.a1 = scno;
>  #endif
>  	return set_regs(tcp->pid);
>  }

Applied, thanks.


-- 
ldv


More information about the Strace-devel mailing list