From: Monk Chiang <sh.chiang04@gmail.com>
Date: Mon, 15 Apr 2019 08:19:23 +0000 (+0000)
Subject: [NDS32] Refine force unwind. Linux kernel only uses RT_SIGRETURN.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=887e182f05d64c0cb2a888711d8d6ca1174fe93a;p=gcc.git

[NDS32] Refine force unwind. Linux kernel only uses RT_SIGRETURN.

libgcc/
	* config/nds32/linux-unwind.h (SIGRETURN): Remove.
	(RT_SIGRETURN): Update.
	(nds32_fallback_frame_state): Update.

From-SVN: r270363
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 950eeabb061..de8d56a2ee7 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-15  Monk Chiang  <sh.chiang04@gmail.com>
+
+	* config/nds32/linux-unwind.h (SIGRETURN): Remove.
+	(RT_SIGRETURN): Update.
+	(nds32_fallback_frame_state): Update.
+
 2019-02-21  Martin Sebor  <msebor@redhat.com>
 
 	* libgcc2.h (__clear_cache): Correct signature.
diff --git a/libgcc/config/nds32/linux-unwind.h b/libgcc/config/nds32/linux-unwind.h
index 0c4df4dde81..adb6f9f450b 100644
--- a/libgcc/config/nds32/linux-unwind.h
+++ b/libgcc/config/nds32/linux-unwind.h
@@ -42,8 +42,7 @@ struct _rt_sigframe {
   struct ucontext_t uc;
 };
 
-#define SIGRETURN 0xeb0e0a64
-#define RT_SIGRETURN 0xab150a64
+#define RT_SIGRETURN 0x8b00f044
 
 #define MD_FALLBACK_FRAME_STATE_FOR nds32_fallback_frame_state
 
@@ -74,16 +73,14 @@ nds32_fallback_frame_state (struct _Unwind_Context *context,
 
   /* Check if we are going through a signal handler.
      See arch/nds32/kernel/signal.c implementation.
-       SWI_SYS_SIGRETURN    -> (0xeb0e0a64)
-       SWI_SYS_RT_SIGRETURN -> (0xab150a64)
      FIXME: Currently we only handle little endian (EL) case.  */
-  if (pc[0] == SIGRETURN || pc[0] == RT_SIGRETURN)
+  if (pc[0] == RT_SIGRETURN)
     {
       /* Using '_sigfame' memory address to locate kernal's sigcontext.
 	 The sigcontext structures in arch/nds32/include/asm/sigcontext.h.  */
       struct _rt_sigframe *rt_;
       rt_ = context->cfa;
-      sc_ = &rt_->sig.uc.uc_mcontext;
+      sc_ = &rt_->uc.uc_mcontext;
     }
   else
     return _URC_END_OF_STACK;