diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 06:42:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 06:42:26 -0400 |
| commit | cd34e202faa4be7f77fd2f7a59824f13dc14901b (patch) | |
| tree | ab43391f5b8c3dcc45d418953d77c588180f5e8e /arch/sh | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
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>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/vsyscall/vsyscall-sigreturn.S | 35 | ||||
| -rw-r--r-- | arch/sh/kernel/vsyscall/vsyscall-trapa.S | 23 |
2 files changed, 45 insertions, 13 deletions
diff --git a/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S index 555a64f124ca..23af17584054 100644 --- a/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S +++ b/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S | |||
| @@ -34,6 +34,41 @@ __kernel_rt_sigreturn: | |||
| 34 | 1: .short __NR_rt_sigreturn | 34 | 1: .short __NR_rt_sigreturn |
| 35 | .LEND_rt_sigreturn: | 35 | .LEND_rt_sigreturn: |
| 36 | .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn | 36 | .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn |
| 37 | .previous | ||
| 37 | 38 | ||
| 38 | .section .eh_frame,"a",@progbits | 39 | .section .eh_frame,"a",@progbits |
| 40 | .LCIE1: | ||
| 41 | .ualong .LCIE1_end - .LCIE1_start | ||
| 42 | .LCIE1_start: | ||
| 43 | .ualong 0 /* CIE ID */ | ||
| 44 | .byte 0x1 /* Version number */ | ||
| 45 | .string "zRS" /* NUL-terminated augmentation string */ | ||
| 46 | .uleb128 0x1 /* Code alignment factor */ | ||
| 47 | .sleb128 -4 /* Data alignment factor */ | ||
| 48 | .byte 0x11 /* Return address register column */ | ||
| 49 | .uleb128 0x1 /* Augmentation length and data */ | ||
| 50 | .byte 0x1b /* DW_EH_PE_pcrel | DW_EH_PE_sdata4. */ | ||
| 51 | .byte 0xc, 0xf, 0x0 /* DW_CFA_def_cfa: r15 ofs 0 */ | ||
| 52 | |||
| 53 | .align 2 | ||
| 54 | .LCIE1_end: | ||
| 55 | |||
| 56 | .ualong .LFDE0_end-.LFDE0_start /* Length FDE0 */ | ||
| 57 | .LFDE0_start: | ||
| 58 | .ualong .LFDE0_start-.LCIE1 /* CIE pointer */ | ||
| 59 | .ualong .LSTART_sigreturn-. /* PC-relative start address */ | ||
| 60 | .ualong .LEND_sigreturn-.LSTART_sigreturn | ||
| 61 | .uleb128 0 /* Augmentation */ | ||
| 62 | .align 2 | ||
| 63 | .LFDE0_end: | ||
| 64 | |||
| 65 | .ualong .LFDE1_end-.LFDE1_start /* Length FDE1 */ | ||
| 66 | .LFDE1_start: | ||
| 67 | .ualong .LFDE1_start-.LCIE1 /* CIE pointer */ | ||
| 68 | .ualong .LSTART_rt_sigreturn-. /* PC-relative start address */ | ||
| 69 | .ualong .LEND_rt_sigreturn-.LSTART_rt_sigreturn | ||
| 70 | .uleb128 0 /* Augmentation */ | ||
| 71 | .align 2 | ||
| 72 | .LFDE1_end: | ||
| 73 | |||
| 39 | .previous | 74 | .previous |
diff --git a/arch/sh/kernel/vsyscall/vsyscall-trapa.S b/arch/sh/kernel/vsyscall/vsyscall-trapa.S index 3e70f851cdc6..0eb74d00690a 100644 --- a/arch/sh/kernel/vsyscall/vsyscall-trapa.S +++ b/arch/sh/kernel/vsyscall/vsyscall-trapa.S | |||
| @@ -3,37 +3,34 @@ | |||
| 3 | .type __kernel_vsyscall,@function | 3 | .type __kernel_vsyscall,@function |
| 4 | __kernel_vsyscall: | 4 | __kernel_vsyscall: |
| 5 | .LSTART_vsyscall: | 5 | .LSTART_vsyscall: |
| 6 | /* XXX: We'll have to do something here once we opt to use the vDSO | 6 | trapa #0x10 |
| 7 | * page for something other than the signal trampoline.. as well as | 7 | nop |
| 8 | * fill out .eh_frame -- PFM. */ | ||
| 9 | .LEND_vsyscall: | 8 | .LEND_vsyscall: |
| 10 | .size __kernel_vsyscall,.-.LSTART_vsyscall | 9 | .size __kernel_vsyscall,.-.LSTART_vsyscall |
| 10 | .previous | ||
| 11 | 11 | ||
| 12 | .section .eh_frame,"a",@progbits | 12 | .section .eh_frame,"a",@progbits |
| 13 | .previous | ||
| 14 | .LCIE: | 13 | .LCIE: |
| 15 | .ualong .LCIE_end - .LCIE_start | 14 | .ualong .LCIE_end - .LCIE_start |
| 16 | .LCIE_start: | 15 | .LCIE_start: |
| 17 | .ualong 0 /* CIE ID */ | 16 | .ualong 0 /* CIE ID */ |
| 18 | .byte 0x1 /* Version number */ | 17 | .byte 0x1 /* Version number */ |
| 19 | .string "zRS" /* NUL-terminated augmentation string */ | 18 | .string "zR" /* NUL-terminated augmentation string */ |
| 20 | .uleb128 0x1 /* Code alignment factor */ | 19 | .uleb128 0x1 /* Code alignment factor */ |
| 21 | .sleb128 -4 /* Data alignment factor */ | 20 | .sleb128 -4 /* Data alignment factor */ |
| 22 | .byte 0x11 /* Return address register column */ | 21 | .byte 0x11 /* Return address register column */ |
| 23 | /* Augmentation length and data (none) */ | 22 | .uleb128 0x1 /* Augmentation length and data */ |
| 24 | .byte 0xc /* DW_CFA_def_cfa */ | 23 | .byte 0x1b /* DW_EH_PE_pcrel | DW_EH_PE_sdata4. */ |
| 25 | .uleb128 0xf /* r15 */ | 24 | .byte 0xc,0xf,0x0 /* DW_CFA_def_cfa: r15 ofs 0 */ |
| 26 | .uleb128 0x0 /* offset 0 */ | ||
| 27 | |||
| 28 | .align 2 | 25 | .align 2 |
| 29 | .LCIE_end: | 26 | .LCIE_end: |
| 30 | 27 | ||
| 31 | .ualong .LFDE_end-.LFDE_start /* Length FDE */ | 28 | .ualong .LFDE_end-.LFDE_start /* Length FDE */ |
| 32 | .LFDE_start: | 29 | .LFDE_start: |
| 33 | .ualong .LCIE /* CIE pointer */ | 30 | .ualong .LFDE_start-.LCIE /* CIE pointer */ |
| 34 | .ualong .LSTART_vsyscall-. /* start address */ | 31 | .ualong .LSTART_vsyscall-. /* PC-relative start address */ |
| 35 | .ualong .LEND_vsyscall-.LSTART_vsyscall | 32 | .ualong .LEND_vsyscall-.LSTART_vsyscall |
| 36 | .uleb128 0 | 33 | .uleb128 0 /* Augmentation */ |
| 37 | .align 2 | 34 | .align 2 |
| 38 | .LFDE_end: | 35 | .LFDE_end: |
| 39 | .previous | 36 | .previous |