sh: vsyscall: Fix up .eh_frame generation.

Some improper formatting caused the .eh_frame generation to fail,
resulting in gcc/g++ testsuite failures with regards to unwinding through
the vDSO. Now that someone is actually working on this on the gcc side
it's time to fix up the kernel side, too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
index 555a64f..23af175 100644 (file)
--- a/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
+++ b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
@@ -34,6 +34,41 @@ __kernel_rt_sigreturn:
 1:     .short  __NR_rt_sigreturn
 .LEND_rt_sigreturn:
        .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn
+       .previous
 
        .section .eh_frame,"a",@progbits
+.LCIE1:
+       .ualong .LCIE1_end - .LCIE1_start
+.LCIE1_start:
+       .ualong 0               /* CIE ID */
+       .byte   0x1             /* Version number */
+       .string "zRS"           /* NUL-terminated augmentation string */
+       .uleb128 0x1            /* Code alignment factor */
+       .sleb128 -4             /* Data alignment factor */
+       .byte   0x11            /* Return address register column */
+       .uleb128 0x1            /* Augmentation length and data */
+       .byte 0x1b              /* DW_EH_PE_pcrel | DW_EH_PE_sdata4. */
+       .byte   0xc, 0xf, 0x0   /* DW_CFA_def_cfa: r15 ofs 0 */
+
+       .align 2
+.LCIE1_end:
+
+       .ualong .LFDE0_end-.LFDE0_start /* Length FDE0 */
+.LFDE0_start:
+       .ualong .LFDE0_start-.LCIE1     /* CIE pointer */
+       .ualong .LSTART_sigreturn-.     /* PC-relative start address */
+       .ualong .LEND_sigreturn-.LSTART_sigreturn
+       .uleb128 0                      /* Augmentation */
+       .align 2
+.LFDE0_end:
+
+       .ualong .LFDE1_end-.LFDE1_start /* Length FDE1 */
+.LFDE1_start:
+       .ualong .LFDE1_start-.LCIE1     /* CIE pointer */
+       .ualong .LSTART_rt_sigreturn-.  /* PC-relative start address */
+       .ualong .LEND_rt_sigreturn-.LSTART_rt_sigreturn
+       .uleb128 0                      /* Augmentation */
+       .align 2
+.LFDE1_end:
+
        .previous

diff --git a/arch/sh/kernel/vsyscall/vsyscall-trapa.S b/arch/sh/kernel/vsyscall/vsyscall-trapa.S
index 3e70f85..0eb74d0 100644 (file)
--- a/arch/sh/kernel/vsyscall/vsyscall-trapa.S
+++ b/arch/sh/kernel/vsyscall/vsyscall-trapa.S
@@ -3,37 +3,34 @@
        .type __kernel_vsyscall,@function
 __kernel_vsyscall:
 .LSTART_vsyscall:
-       /* XXX: We'll have to do something here once we opt to use the vDSO
-        * page for something other than the signal trampoline.. as well as
-        * fill out .eh_frame -- PFM. */
+       trapa   #0x10
+        nop
 .LEND_vsyscall:
        .size __kernel_vsyscall,.-.LSTART_vsyscall
+       .previous
 
        .section .eh_frame,"a",@progbits
-       .previous
 .LCIE:
        .ualong .LCIE_end - .LCIE_start
 .LCIE_start:
        .ualong 0               /* CIE ID */
        .byte   0x1             /* Version number */
-       .string "zRS"           /* NUL-terminated augmentation string */
+       .string "zR"            /* NUL-terminated augmentation string */
        .uleb128 0x1            /* Code alignment factor */
        .sleb128 -4             /* Data alignment factor */
        .byte   0x11            /* Return address register column */
-                               /* Augmentation length and data (none) */
-       .byte   0xc             /* DW_CFA_def_cfa */
-       .uleb128 0xf            /* r15 */
-       .uleb128 0x0            /* offset 0 */
-
+       .uleb128 0x1            /* Augmentation length and data */
+       .byte 0x1b              /* DW_EH_PE_pcrel | DW_EH_PE_sdata4. */
+       .byte   0xc,0xf,0x0     /* DW_CFA_def_cfa: r15 ofs 0 */
        .align 2
 .LCIE_end:
 
        .ualong .LFDE_end-.LFDE_start   /* Length FDE */
 .LFDE_start:
-       .ualong .LCIE                   /* CIE pointer */
-       .ualong .LSTART_vsyscall-.      /* start address */
+       .ualong .LFDE_start-.LCIE       /* CIE pointer */
+       .ualong .LSTART_vsyscall-.      /* PC-relative start address */
        .ualong .LEND_vsyscall-.LSTART_vsyscall
-       .uleb128 0
+       .uleb128 0                      /* Augmentation */
        .align 2
 .LFDE_end:
        .previous