From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- libpthread/linuxthreads.old/ptlongjmp.c | 67 --------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 libpthread/linuxthreads.old/ptlongjmp.c (limited to 'libpthread/linuxthreads.old/ptlongjmp.c') diff --git a/libpthread/linuxthreads.old/ptlongjmp.c b/libpthread/linuxthreads.old/ptlongjmp.c deleted file mode 100644 index 5cb708944..000000000 --- a/libpthread/linuxthreads.old/ptlongjmp.c +++ /dev/null @@ -1,67 +0,0 @@ -/* Linuxthreads - a simple clone()-based implementation of Posix */ -/* threads for Linux. */ -/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr) */ -/* */ -/* This program 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. */ -/* */ -/* This program 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. */ - -/* Redefine siglongjmp and longjmp so that they interact correctly - with cleanup handlers */ - -#include -#include "pthread.h" -#include "internals.h" -#include -#include - -static void pthread_cleanup_upto(__jmp_buf target) -{ - pthread_descr self = thread_self(); - struct _pthread_cleanup_buffer * c; - char *currentframe = CURRENT_STACK_FRAME; - - for (c = THREAD_GETMEM(self, p_cleanup); - c != NULL && _JMPBUF_UNWINDS(target, c); - c = c->__prev) - { -#ifdef _STACK_GROWS_DOWN - if ((char *) c <= currentframe) - { - c = NULL; - break; - } -#elif defined _STACK_GROWS_UP - if ((char *) c >= currentframe) - { - c = NULL; - break; - } -#else -# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -#endif - c->__routine(c->__arg); - } - THREAD_SETMEM(self, p_cleanup, c); - if (THREAD_GETMEM(self, p_in_sighandler) - && _JMPBUF_UNWINDS(target, THREAD_GETMEM(self, p_in_sighandler))) - THREAD_SETMEM(self, p_in_sighandler, NULL); -} - -void siglongjmp(sigjmp_buf env, int val) -{ - pthread_cleanup_upto(env->__jmpbuf); - __libc_siglongjmp(env, val); -} - -void longjmp(jmp_buf env, int val) -{ - pthread_cleanup_upto(env->__jmpbuf); - __libc_longjmp(env, val); -} -- cgit v1.2.3