From 8dd9c51eb2f6c5dc659b426dc3bd114751adb405 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 31 Jan 2002 15:49:34 +0000 Subject: Fixup setjmp and longjmp so they behave themselves properly now on both x86 and arm... -Erik --- libc/sysdeps/linux/i386/Makefile | 2 +- libc/sysdeps/linux/i386/jmp-unwind.c | 29 ------------------- libc/sysdeps/linux/i386/longjmp.c | 54 ------------------------------------ 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 libc/sysdeps/linux/i386/jmp-unwind.c delete mode 100644 libc/sysdeps/linux/i386/longjmp.c (limited to 'libc/sysdeps/linux/i386') diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile index 67dd89ebf..143162ccb 100644 --- a/libc/sysdeps/linux/i386/Makefile +++ b/libc/sysdeps/linux/i386/Makefile @@ -42,7 +42,7 @@ ifeq ($(UNIFIED_SYSCALL),true) endif SOBJS=$(patsubst %.S,%.o, $(SSRC)) -CSRC=brk.c longjmp.c #jmp-unwind.c +CSRC=brk.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) diff --git a/libc/sysdeps/linux/i386/jmp-unwind.c b/libc/sysdeps/linux/i386/jmp-unwind.c deleted file mode 100644 index 083dc74a8..000000000 --- a/libc/sysdeps/linux/i386/jmp-unwind.c +++ /dev/null @@ -1,29 +0,0 @@ -/* _longjmp_unwind -- Clean up stack frames unwound by longjmp. Stub version. - Copyright (C) 1995, 1997 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include - -void -_longjmp_unwind (jmp_buf env, int val) -{ - - /* This function can perform any cleanups necessary to safely unwind the - stack frames around the current context which ENV unwinds past. */ - -} diff --git a/libc/sysdeps/linux/i386/longjmp.c b/libc/sysdeps/linux/i386/longjmp.c deleted file mode 100644 index 46e48f569..000000000 --- a/libc/sysdeps/linux/i386/longjmp.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1991, 92, 94, 95, 97, 98 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include -#include -#define __USE_GNU -#include - - -#if 0 -extern void _longjmp_unwind (jmp_buf env, int val); -#endif -extern void __longjmp(__jmp_buf __env, int __val) - __attribute__ ((__noreturn__)); - -/* Set the signal mask to the one specified in ENV, and jump - to the position specified in ENV, causing the setjmp - call there to return VAL, or 1 if VAL is 0. */ -void -__uClibc_siglongjmp (sigjmp_buf env, int val) -{ -#if 0 - /* Perform any cleanups needed by the frames being unwound. */ - _longjmp_unwind (env, val); -#endif - - if (env[0].__mask_was_saved) - /* Restore the saved signal mask. */ - (void) sigprocmask (SIG_SETMASK, &env[0].__saved_mask, - (sigset_t *) NULL); - - /* Call the machine-dependent function to restore machine state. */ - __longjmp (env[0].__jmpbuf, val ?: 1); -} - -__asm__(".weak longjmp; longjmp = __uClibc_siglongjmp"); -__asm__(".weak _longjmp; _longjmp = __uClibc_siglongjmp"); -__asm__(".weak siglongjmp; siglongjmp = __uClibc_siglongjmp"); -__asm__(".weak __sigprocmask; __sigprocmask = sigprocmask"); -- cgit v1.2.3