diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/elf/bsd-setjmp.S | 13 | ||||
| -rw-r--r-- | sysdeps/i386/elf/setjmp.S | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 16 |
3 files changed, 25 insertions, 16 deletions
diff --git a/sysdeps/i386/elf/bsd-setjmp.S b/sysdeps/i386/elf/bsd-setjmp.S index 690dcb1..c1a833a 100644 --- a/sysdeps/i386/elf/bsd-setjmp.S +++ b/sysdeps/i386/elf/bsd-setjmp.S @@ -1,5 +1,5 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,2000,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -56,10 +56,9 @@ ENTRY (BP_SYM (setjmp)) we can't save and restore our caller's value. Instead, we do an indirect jump through the GOT, using for the temporary register %ecx, which is call-clobbered. */ - call here2 -here2: popl %ecx - addl $_GLOBAL_OFFSET_TABLE_+[.-here2], %ecx - movl C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOT)(%ecx), %ecx + call 1f + addl $_GLOBAL_OFFSET_TABLE_, %ecx + leal C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOTOFF)(%ecx), %ecx call *%ecx #else call BP_SYM (__sigjmp_save) @@ -67,4 +66,8 @@ here2: popl %ecx popl %ecx popl %edx ret +#ifdef PIC +1: movl (%esp), %ecx + ret +#endif END (BP_SYM (setjmp)) diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S index 6e1df17..3f52195 100644 --- a/sysdeps/i386/elf/setjmp.S +++ b/sysdeps/i386/elf/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386, ELF version. - Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,2000,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -51,12 +51,12 @@ ENTRY (BP_SYM (__sigsetjmp)) we can't save and restore our caller's value. Instead, we do an indirect jump through the GOT, using for the temporary register %ecx, which is call-clobbered. */ - call L(here) -L(here): - popl %ecx - addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ecx - movl C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOT)(%ecx), %ecx + call 1f + addl $_GLOBAL_OFFSET_TABLE_, %ecx + leal C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOTOFF)(%ecx), %ecx jmp *%ecx +1: movl (%esp), %ecx + ret #else jmp BP_SYM (__sigjmp_save) #endif diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 884dbd5..2cc39d6 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 95, 96, 97, 98, 99, 00 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1993, 1995-2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995. @@ -79,9 +79,12 @@ #define SYSCALL_ERROR_HANDLER \ 0:pushl %ebx; \ call 1f; \ -1:popl %ebx; \ + .subsection 1; \ +1:movl (%esp), %ebx; \ + ret; \ + .previous; \ + addl $_GLOBAL_OFFSET_TABLE_, %ebx; \ xorl %edx, %edx; \ - addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx; \ subl %eax, %edx; \ pushl %edx; \ PUSH_ERRNO_LOCATION_RETURN; \ @@ -97,9 +100,12 @@ #else #define SYSCALL_ERROR_HANDLER \ 0:call 1f; \ -1:popl %ecx; \ + .subsection 1; \ +1:movl (%esp), %ecx; \ + ret; \ + .previous; \ + addl $_GLOBAL_OFFSET_TABLE_, %ecx; \ xorl %edx, %edx; \ - addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx; \ subl %eax, %edx; \ movl errno@GOT(%ecx), %ecx; \ movl %edx, (%ecx); \ |