sh: Add CFI annotations for exception return.

Annotate various assembly code paths with CFI assembler directives so
that DWARF unwind info is available for the unwinder.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index b3b215f..e63178f 100644 (file)
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -43,6 +43,7 @@
  *     syscall #
  *
  */
+#include <asm/dwarf.h>
 
 #if defined(CONFIG_PREEMPT)
 #  define preempt_stop()       cli ; TRACE_IRQS_OFF
@@ -66,6 +67,11 @@ ENTRY(exception_error)
 
        .align  2
 ret_from_exception:
+       CFI_STARTPROC simple
+       CFI_DEF_CFA r14, 0
+       CFI_REL_OFFSET 17, 64
+       CFI_REL_OFFSET 15, 0
+       CFI_REL_OFFSET 14, 56
        preempt_stop()
 ENTRY(ret_from_irq)
        !
@@ -240,6 +246,7 @@ debug_trap:
         nop
        bra     __restore_all
         nop
+       CFI_ENDPROC
 
        .align  2
 1:     .long   debug_trap_table