Unwind resume support --- Makefile | 12 +++++++++ rt-unwind-resume.c | 1 unwind-resume.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) Index: glibc/sysdeps/mach/hurd/rt-unwind-resume.c =================================================================== RCS file: glibc/sysdeps/mach/hurd/rt-unwind-resume.c diff -N glibc/sysdeps/mach/hurd/rt-unwind-resume.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ glibc/sysdeps/mach/hurd/rt-unwind-resume.c 30 Jul 2009 00:21:33 -0000 @@ -0,0 +1 @@ +#include Index: glibc/sysdeps/mach/hurd/unwind-resume.c =================================================================== RCS file: glibc/sysdeps/mach/hurd/unwind-resume.c diff -N glibc/sysdeps/mach/hurd/unwind-resume.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ glibc/sysdeps/mach/hurd/unwind-resume.c 30 Jul 2009 00:21:33 -0000 @@ -0,0 +1,64 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek . + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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 +#include + +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); +static _Unwind_Reason_Code (*libgcc_s_personality) + (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, + struct _Unwind_Context *); + +static void +init (void) +{ + void *resume, *personality; + void *handle; + + handle = __libc_dlopen ("libgcc_s.so.1"); + + if (handle == NULL + || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL + || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) + __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); + + libgcc_s_resume = resume; + libgcc_s_personality = personality; +} + +void +_Unwind_Resume (struct _Unwind_Exception *exc) +{ + if (__builtin_expect (libgcc_s_resume == NULL, 0)) + init (); + libgcc_s_resume (exc); +} + +_Unwind_Reason_Code +__gcc_personality_v0 (int version, _Unwind_Action actions, + _Unwind_Exception_Class exception_class, + struct _Unwind_Exception *ue_header, + struct _Unwind_Context *context) +{ + if (__builtin_expect (libgcc_s_personality == NULL, 0)) + init (); + return libgcc_s_personality (version, actions, exception_class, + ue_header, context); +} Index: glibc/sysdeps/mach/hurd/Makefile =================================================================== RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/Makefile,v retrieving revision 1.96 diff -u -p -r1.96 Makefile --- glibc/sysdeps/mach/hurd/Makefile 7 Jan 2009 01:59:31 -0000 1.96 +++ glibc/sysdeps/mach/hurd/Makefile 30 Jul 2009 00:21:33 -0000 @@ -211,4 +211,16 @@ ifeq ($(subdir),sunrpc) net/route.h endif +ifeq ($(subdir),csu) +routines += unwind-resume +shared-only-routines += unwind-resume +CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables +endif + +ifeq ($(subdir),rt) +librt-sysdep_routines += rt-unwind-resume +librt-shared-only-routines += rt-unwind-resume +CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables +endif + endif # in-Makerules