From 814d9c7f1dc5091c71ec3822c5a6bfdff3a4d258 Mon Sep 17 00:00:00 2001
From: shaojinchun <shaojinchun@rt-thread.com>
Date: Tue, 25 May 2021 18:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E5=A4=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=20=E6=AD=A4=E9=97=AE=E9=A2=98=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=8F=96=E5=9B=9Esig=20bak=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lwp/arch/aarch64/cortex-a/lwp_gcc.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/lwp/arch/aarch64/cortex-a/lwp_gcc.S b/components/lwp/arch/aarch64/cortex-a/lwp_gcc.S
index 32425d4141..e139652205 100644
--- a/components/lwp/arch/aarch64/cortex-a/lwp_gcc.S
+++ b/components/lwp/arch/aarch64/cortex-a/lwp_gcc.S
@@ -299,9 +299,10 @@ lwp_signal_quit:
     /* x0 is user_ctx : ori sp, pc, cpsr */
     ldr x1, [x0]
     ldr x2, [x0, #8]
-    ldr x3, [x0, #10]
+    ldr x3, [x0, #16]
     msr spsr_el1, x3
     msr elr_el1, x2
+    add x1, x1, #16
     msr sp_el0, x1
 
     msr spsel, #0
@@ -363,8 +364,8 @@ user_do_signal:
     ic ialluis
     dsb sy
 
-    mov x9, sp
-    add x0, sp, #0x10 /* lwp_sigreturn */
+    mov x9, sp /* lwp_sigreturn */
+    mov x0, sp
 
     msr spsel, #1
 
-- 
Gitee