diff options
| author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:44 -0500 |
| commit | cadd516422d9382313144aa58f9e46ee7a2c0a28 (patch) | |
| tree | 84cb8aa63f068bd4609723b43cdfd41ec74c9665 /arch/x86/vdso/vdso32/sysenter.S | |
| parent | 16e48e7e7929d841273d87027079660bca5e37bd (diff) | |
x86 vDSO: canonicalize sysenter .eh_frame
Some assembler versions automagically optimize .eh_frame contents,
changing their size. The CFI in sysenter.S was not using optimal
formatting, so it would be changed by newer/smarter assemblers.
This ran afoul of the wired constant for padding out the other vDSO
images to match its size. This changes the original hand-coded
source to use the optimal format encoding for its operations. That
leaves nothing more for a fancy assembler to do, so the sizes will
match the wired-in expected size regardless of the assembler version.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/vdso/vdso32/sysenter.S')
| -rw-r--r-- | arch/x86/vdso/vdso32/sysenter.S | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/x86/vdso/vdso32/sysenter.S b/arch/x86/vdso/vdso32/sysenter.S index 902d5fc11f1b..e2800affa754 100644 --- a/arch/x86/vdso/vdso32/sysenter.S +++ b/arch/x86/vdso/vdso32/sysenter.S | |||
| @@ -84,31 +84,25 @@ VDSO32_SYSENTER_RETURN: /* Symbol used by sysenter.c via vdso32-syms.h */ | |||
| 84 | .uleb128 0 | 84 | .uleb128 0 |
| 85 | /* What follows are the instructions for the table generation. | 85 | /* What follows are the instructions for the table generation. |
| 86 | We have to record all changes of the stack pointer. */ | 86 | We have to record all changes of the stack pointer. */ |
| 87 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 87 | .byte 0x40 + (.Lpush_ecx-.LSTART_vsyscall) /* DW_CFA_advance_loc */ |
| 88 | .long .Lpush_ecx-.LSTART_vsyscall | ||
| 89 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 88 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 90 | .byte 0x08 /* RA at offset 8 now */ | 89 | .byte 0x08 /* RA at offset 8 now */ |
| 91 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 90 | .byte 0x40 + (.Lpush_edx-.Lpush_ecx) /* DW_CFA_advance_loc */ |
| 92 | .long .Lpush_edx-.Lpush_ecx | ||
| 93 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 91 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 94 | .byte 0x0c /* RA at offset 12 now */ | 92 | .byte 0x0c /* RA at offset 12 now */ |
| 95 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 93 | .byte 0x40 + (.Lenter_kernel-.Lpush_edx) /* DW_CFA_advance_loc */ |
| 96 | .long .Lenter_kernel-.Lpush_edx | ||
| 97 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 94 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 98 | .byte 0x10 /* RA at offset 16 now */ | 95 | .byte 0x10 /* RA at offset 16 now */ |
| 99 | .byte 0x85, 0x04 /* DW_CFA_offset %ebp -16 */ | 96 | .byte 0x85, 0x04 /* DW_CFA_offset %ebp -16 */ |
| 100 | /* Finally the epilogue. */ | 97 | /* Finally the epilogue. */ |
| 101 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 98 | .byte 0x40 + (.Lpop_ebp-.Lenter_kernel) /* DW_CFA_advance_loc */ |
| 102 | .long .Lpop_ebp-.Lenter_kernel | ||
| 103 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 99 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 104 | .byte 0x0c /* RA at offset 12 now */ | 100 | .byte 0x0c /* RA at offset 12 now */ |
| 105 | .byte 0xc5 /* DW_CFA_restore %ebp */ | 101 | .byte 0xc5 /* DW_CFA_restore %ebp */ |
| 106 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 102 | .byte 0x40 + (.Lpop_edx-.Lpop_ebp) /* DW_CFA_advance_loc */ |
| 107 | .long .Lpop_edx-.Lpop_ebp | ||
| 108 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 103 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 109 | .byte 0x08 /* RA at offset 8 now */ | 104 | .byte 0x08 /* RA at offset 8 now */ |
| 110 | .byte 0x04 /* DW_CFA_advance_loc4 */ | 105 | .byte 0x40 + (.Lpop_ecx-.Lpop_edx) /* DW_CFA_advance_loc */ |
| 111 | .long .Lpop_ecx-.Lpop_edx | ||
| 112 | .byte 0x0e /* DW_CFA_def_cfa_offset */ | 106 | .byte 0x0e /* DW_CFA_def_cfa_offset */ |
| 113 | .byte 0x04 /* RA at offset 4 now */ | 107 | .byte 0x04 /* RA at offset 4 now */ |
| 114 | .align 4 | 108 | .align 4 |