From 281443fa129efcfe45ccc28194a738fb46e8dcb9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Jan 2008 13:30:44 +0100 Subject: [PATCH] --- yaml --- r: 79849 b: refs/heads/master c: cadd516422d9382313144aa58f9e46ee7a2c0a28 h: refs/heads/master i: 79847: 2ea0aa2098ce012802fb5f7c489c395a0cdbf20a v: v3 --- [refs] | 2 +- trunk/arch/x86/vdso/vdso32/int80.S | 2 +- trunk/arch/x86/vdso/vdso32/syscall.S | 2 +- trunk/arch/x86/vdso/vdso32/sysenter.S | 18 ++++++------------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 7d1728f3c066..6c8e4aa895a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16e48e7e7929d841273d87027079660bca5e37bd +refs/heads/master: cadd516422d9382313144aa58f9e46ee7a2c0a28 diff --git a/trunk/arch/x86/vdso/vdso32/int80.S b/trunk/arch/x86/vdso/vdso32/int80.S index be4b7a9a7cdd..b15b7c01aedb 100644 --- a/trunk/arch/x86/vdso/vdso32/int80.S +++ b/trunk/arch/x86/vdso/vdso32/int80.S @@ -50,7 +50,7 @@ __kernel_vsyscall: /* * Pad out the segment to match the size of the sysenter.S version. */ -VDSO32_vsyscall_eh_frame_size = 0x44 +VDSO32_vsyscall_eh_frame_size = 0x40 .section .data,"aw",@progbits .space VDSO32_vsyscall_eh_frame_size-(.LENDFDEDLSI-.LSTARTFRAMEDLSI), 0 .previous diff --git a/trunk/arch/x86/vdso/vdso32/syscall.S b/trunk/arch/x86/vdso/vdso32/syscall.S index fe88d34f822f..5415b5613d55 100644 --- a/trunk/arch/x86/vdso/vdso32/syscall.S +++ b/trunk/arch/x86/vdso/vdso32/syscall.S @@ -71,7 +71,7 @@ __kernel_vsyscall: /* * Pad out the segment to match the size of the sysenter.S version. */ -VDSO32_vsyscall_eh_frame_size = 0x44 +VDSO32_vsyscall_eh_frame_size = 0x40 .section .data,"aw",@progbits .space VDSO32_vsyscall_eh_frame_size-(.LENDFDE1-.LSTARTFRAME), 0 .previous diff --git a/trunk/arch/x86/vdso/vdso32/sysenter.S b/trunk/arch/x86/vdso/vdso32/sysenter.S index 902d5fc11f1b..e2800affa754 100644 --- a/trunk/arch/x86/vdso/vdso32/sysenter.S +++ b/trunk/arch/x86/vdso/vdso32/sysenter.S @@ -84,31 +84,25 @@ VDSO32_SYSENTER_RETURN: /* Symbol used by sysenter.c via vdso32-syms.h */ .uleb128 0 /* What follows are the instructions for the table generation. We have to record all changes of the stack pointer. */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lpush_ecx-.LSTART_vsyscall + .byte 0x40 + (.Lpush_ecx-.LSTART_vsyscall) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x08 /* RA at offset 8 now */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lpush_edx-.Lpush_ecx + .byte 0x40 + (.Lpush_edx-.Lpush_ecx) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x0c /* RA at offset 12 now */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lenter_kernel-.Lpush_edx + .byte 0x40 + (.Lenter_kernel-.Lpush_edx) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x10 /* RA at offset 16 now */ .byte 0x85, 0x04 /* DW_CFA_offset %ebp -16 */ /* Finally the epilogue. */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lpop_ebp-.Lenter_kernel + .byte 0x40 + (.Lpop_ebp-.Lenter_kernel) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x0c /* RA at offset 12 now */ .byte 0xc5 /* DW_CFA_restore %ebp */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lpop_edx-.Lpop_ebp + .byte 0x40 + (.Lpop_edx-.Lpop_ebp) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x08 /* RA at offset 8 now */ - .byte 0x04 /* DW_CFA_advance_loc4 */ - .long .Lpop_ecx-.Lpop_edx + .byte 0x40 + (.Lpop_ecx-.Lpop_edx) /* DW_CFA_advance_loc */ .byte 0x0e /* DW_CFA_def_cfa_offset */ .byte 0x04 /* RA at offset 4 now */ .align 4