summaryrefslogtreecommitdiff
path: root/sysdeps/i386/setjmp.S
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386/setjmp.S')
-rw-r--r--sysdeps/i386/setjmp.S21
1 files changed, 5 insertions, 16 deletions
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 56c3994f66..e01d32b66c 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -1,6 +1,5 @@
/* setjmp for i386.
- Copyright (C) 1995,1996,1997,2000,2001,2005,2006
- Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 2000, 2001 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
@@ -19,7 +18,9 @@
02111-1307 USA. */
#include <sysdep.h>
-#include <jmpbuf-offsets.h>
+#define _ASM
+#define _SETJMP_H
+#include <bits/setjmp.h>
#include <asm-syntax.h>
#include "bp-sym.h"
#include "bp-asm.h"
@@ -39,24 +40,12 @@ ENTRY (BP_SYM (__sigsetjmp))
movl %esi, (JB_SI*4)(%eax)
movl %edi, (JB_DI*4)(%eax)
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
-#ifdef PTR_MANGLE
- PTR_MANGLE (%ecx)
-#endif
movl %ecx, (JB_SP*4)(%eax)
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
-#ifdef PTR_MANGLE
- PTR_MANGLE (%ecx)
-#endif
movl %ecx, (JB_PC*4)(%eax)
LEAVE /* pop frame pointer to prepare for tail-call. */
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
- /* In ld.so we never save the signal mask. */
- xorl %eax, %eax
- ret
-#else
/* Make a tail call to __sigjmp_save; it takes the same args. */
- jmp __sigjmp_save
-#endif
+ jmp BP_SYM (__sigjmp_save)
END (BP_SYM (__sigsetjmp))