(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

[thirdparty/glibc.git] / sysdeps / i386 / bsd-setjmp.S

diff --git a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S
index c9af0e14777af1f4ab65762a72998c7f0bdc011a..ea242d1f96f889983009ba86fc563e0151e63cf1 100644 (file)
--- a/sysdeps/i386/bsd-setjmp.S
+++ b/sysdeps/i386/bsd-setjmp.S
@@ -1,5 +1,5 @@
 /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  i386 version.
-   Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994,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
@@ -22,14 +22,12 @@
    in setjmp doesn't clobber the state restored by longjmp.  */
 
 #include <sysdep.h>
-#include <jmpbuf-offsets.h>
+#define _ASM
+#define _SETJMP_H
+#include <bits/setjmp.h>
 #include "bp-sym.h"
 #include "bp-asm.h"
 
-#define PARMS  LINKAGE         /* no space for saved regs */
-#define JMPBUF PARMS
-#define SIGMSK JMPBUF+PTR_SIZE
-
 ENTRY (BP_SYM (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
@@ -44,27 +42,17 @@ ENTRY (BP_SYM (setjmp))
        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.  */
 
        /* Call __sigjmp_save.  */
        pushl $1
-       cfi_adjust_cfa_offset (4)
        pushl 8(%esp)
-       cfi_adjust_cfa_offset (4)
        call BP_SYM (__sigjmp_save)
        popl %ecx
-       cfi_adjust_cfa_offset (-4)
        popl %edx
-       cfi_adjust_cfa_offset (-4)
        ret
 END (BP_SYM (setjmp))