diff options
author | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
commit | 2366713d874342c94f9362b0d6b2461e1c68dbc3 (patch) | |
tree | 4e46c602c175d0487a7ab45a9ed178fac38abbe5 /sysdeps/i386/bsd-setjmp.S | |
parent | 9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff) | |
download | glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.xz glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.zip |
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/bsd-setjmp.S')
-rw-r--r-- | sysdeps/i386/bsd-setjmp.S | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S index 5ce3842f01..b6daa8c036 100644 --- a/sysdeps/i386/bsd-setjmp.S +++ b/sysdeps/i386/bsd-setjmp.S @@ -22,15 +22,13 @@ #include <sysdep.h> #include <jmpbuf-offsets.h> -#include "bp-sym.h" -#include "bp-asm.h" #include <stap-probe.h> -#define PARMS LINKAGE /* no space for saved regs */ +#define PARMS 4 /* no space for saved regs */ #define JMPBUF PARMS -#define SIGMSK JMPBUF+PTR_SIZE +#define SIGMSK JMPBUF+4 -ENTRY (BP_SYM (setjmp)) +ENTRY (setjmp) /* Note that we have to use a non-exported symbol in the next jump since otherwise gas will emit it as a jump through the PLT which is what we cannot use here. */ @@ -46,7 +44,7 @@ ENTRY (BP_SYM (setjmp)) PTR_MANGLE (%ecx) #endif movl %ecx, (JB_SP*4)(%eax) - movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ + movl 0(%esp), %ecx /* Save PC we are returning to now. */ LIBC_PROBE (setjmp, 3, 4@%eax, -4@$1, 4@%ecx) #ifdef PTR_MANGLE PTR_MANGLE (%ecx) @@ -59,10 +57,10 @@ ENTRY (BP_SYM (setjmp)) cfi_adjust_cfa_offset (4) pushl 8(%esp) cfi_adjust_cfa_offset (4) - call BP_SYM (__sigjmp_save) + call __sigjmp_save popl %ecx cfi_adjust_cfa_offset (-4) popl %edx cfi_adjust_cfa_offset (-4) ret -END (BP_SYM (setjmp)) +END (setjmp) |