summaryrefslogtreecommitdiff
path: root/setjmp
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-03-27 10:00:09 +0000
committerRoland McGrath <roland@gnu.org>1995-03-27 10:00:09 +0000
commit1474b80f017c2fcc18b1de5bbc51884650d30582 (patch)
tree1baa3c89ef3802cda051fa7f8f9c9bb8c0bf6abd /setjmp
parentd365fd2cfa4248fcce18fc60d3d90598aa1f534b (diff)
downloadglibc-1474b80f017c2fcc18b1de5bbc51884650d30582.tar.gz
Mon Mar 27 02:23:15 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/unistd.h [__USE_BSD] (ttyslot): Declare it. * posix/unistd.h [__USE_BSD] (L_SET, L_INCR, L_XTND): Define unless L_SET already defined. * misc/sys/file.h (L_SET, L_INCR, L_XTND): Don't define if L_SET already defined. Incorporated -lutil library from 4.4-Lite. * misc/Makefile (extra-libs, libutil-routines): New variables. * misc/login.c, misc/login_tty.c, misc/logout.c, misc/logwtmp.c, sysdeps/generic/pty.c: New files for -lutil incorporated from 4.4-Lite. Support simple, light-weight unwind-protect mechanism for longjmp. * setjmp/longjmp.c: Call _longjmp_unwind first thing. * sysdeps/mach/hurd/jmp-unwind.c: New file. * sysdeps/stub/jmp-unwind.c: New file. * sysdeps/i386/jmp_buf.h (_JMPBUF_UNWINDS): New macro. * sysdeps/mips/jmp_buf.h (_JMPBUF_UNWINDS): New macro. * setjmp/Makefile (routines): Add jmp-unwind. * hurd/hurd/userlink.h (struct hurd_userlink): Move `next' and `prevp' members into new substructure `resource'; add another such substructure `thread' and members `cleanup' (function ptr) and `cleanup_data' (generic ptr). (_hurd_userlink_link, _hurd_userlink_unlink): Insert/remove LINK into the `_hurd_self_sigstate ()->active_resources' list via the `thread' substructure. * hurd/hurd/port.h (_hurd_port_cleanup): Declare it. (_hurd_port_locked_get): Set LINK->cleanup to _hurd_port_cleanup and LINK->cleanup_data' to the port extracted. * hurd/hurd/signal.h (struct hurd_sigstate): New member `active_resources'. * hurd/port-cleanup.c: New file. * hurd/Makefile (routines): Add port-cleanup. * malloc/malloc.c: Include errno.h. Sat Mar 25 18:24:21 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * locale/loadlocale.c (_nl_load_locale): Avoid */ inside comment.
Diffstat (limited to 'setjmp')
-rw-r--r--setjmp/Makefile2
-rw-r--r--setjmp/longjmp.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/setjmp/Makefile b/setjmp/Makefile
index 4a7e4aa85a..4773b617e1 100644
--- a/setjmp/Makefile
+++ b/setjmp/Makefile
@@ -24,7 +24,7 @@ subdir := setjmp
headers := setjmp.h jmp_buf.h
routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \
- longjmp __longjmp
+ longjmp __longjmp jmp-unwind
tests := tst-setjmp
diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c
index d4e4ef7740..c70be7b886 100644
--- a/setjmp/longjmp.c
+++ b/setjmp/longjmp.c
@@ -21,12 +21,17 @@ Cambridge, MA 02139, USA. */
#include <signal.h>
+extern void _longjmp_unwind (jmp_buf env, int val);
+
/* 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
longjmp (sigjmp_buf env, int val)
{
+ /* Perform any cleanups needed by the frames being unwound. */
+ _longjmp_unwind (env, val);
+
if (env[0].__mask_was_saved)
/* Restore the saved signal mask. */
(void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask,