about summary refs log tree commit diff
path: root/sysdeps/i386/bits/setjmp.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-16 23:37:51 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-16 23:37:51 +0000
commit376c348c9175470e8f48a563311203cbf8bf7e80 (patch)
tree1725ce297747e29ea09e6b324404caf594332e5b /sysdeps/i386/bits/setjmp.h
parentf806546c561b08d180e6f481a2720bcbbcfb9cda (diff)
downloadglibc-376c348c9175470e8f48a563311203cbf8bf7e80.tar.gz
glibc-376c348c9175470e8f48a563311203cbf8bf7e80.tar.xz
glibc-376c348c9175470e8f48a563311203cbf8bf7e80.zip
Update.
	* sysdeps/i386/elf/bsd-setjmp.S: Real implementation.
	* sysdeps/i386/elf/bsd-_setjmp.S: Removed.
	* sysdeps/i386/elf/setjmp.S (setjmp): Removed here.
	* sysdeps/i386/bsd-_setjmp.S: Real implementation.
	* sysdeps/i386/bsd-setjmp.S: Real implementation.
	* sysdeps/i386/bits/setjmp.h: Remove PUSH_SIGNAL_MASK definition.
	* sysdeps/i386/setjmp.S: Remove PIC support.  This is the non-ELF
	version.
	* stdio-common/tstscanf.c (main): Add two testcases for '*' modifier.
Diffstat (limited to 'sysdeps/i386/bits/setjmp.h')
-rw-r--r--sysdeps/i386/bits/setjmp.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/sysdeps/i386/bits/setjmp.h b/sysdeps/i386/bits/setjmp.h
index 66047643db..b8de504a9d 100644
--- a/sysdeps/i386/bits/setjmp.h
+++ b/sysdeps/i386/bits/setjmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 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
@@ -32,28 +32,7 @@
 # define JB_SIZE 24
 #endif
 
-#ifdef	_ASM
-/* We internally convert all setjmp (buf) calls to sigsetjmp (buf, mask),
-   so we must shift with the call frame to insert the mask argument.  */
-# if __BOUNDED_POINTERS__
-#  define PUSH_SIGNAL_MASK(MASK)				\
-	popl %eax;		/* return address */		\
-	popl %ecx;		/* jmp_buf value */		\
-	popl %edx;		/* jmp_buf low bound */		\
-	pushl 0(%esp);		/* jmp_buf high bound */	\
-	movl $MASK, 4(%esp);					\
-	pushl %edx;						\
-	pushl %ecx;						\
-	pushl %eax
-# else
-#  define PUSH_SIGNAL_MASK(MASK)			\
-	popl %eax;		/* return address */	\
-	popl %ecx;		/* jmp_buf */		\
-	pushl $MASK;					\
-	pushl %ecx;					\
-	pushl %eax
-# endif
-#else
+#ifndef	_ASM
 typedef int __jmp_buf[6];
 #endif