2.5-18.1

[jlayton/glibc.git] / sysdeps / i386 / bsd-_setjmp.S

diff --git a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S
index aa8df167d0050aa7bea26d7f926c579a858b18a2..ee329ee86c24273cc4445ae349ae0af7db73c0b2 100644 (file)
--- a/sysdeps/i386/bsd-_setjmp.S
+++ b/sysdeps/i386/bsd-_setjmp.S
@@ -1,5 +1,5 @@
 /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'.  i386 version.
-   Copyright (C) 1994-1997,2000,2001,2002 Free Software Foundation, Inc.
+   Copyright (C) 1994-1997,2000-2002,2005, 2006 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
@@ -22,9 +22,7 @@
    in setjmp doesn't clobber the state restored by longjmp.  */
 
 #include <sysdep.h>
-#define _ASM
-#define _SETJMP_H
-#include <bits/setjmp.h>
+#include <jmpbuf-offsets.h>
 #include "bp-sym.h"
 #include "bp-asm.h"
 
@@ -44,8 +42,14 @@ ENTRY (BP_SYM (_setjmp))
        movl %esi, (JB_SI*4)(%edx)
        movl %edi, (JB_DI*4)(%edx)
        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)(%edx)
        movl PCOFF(%esp), %ecx  /* Save PC we are returning to now.  */
+#ifdef PTR_MANGLE
+       PTR_MANGLE (%ecx)
+#endif
        movl %ecx, (JB_PC*4)(%edx)
        LEAVE
        movl %ebp, (JB_BP*4)(%edx) /* Save caller's frame pointer.  */