r3522 - in glibc-package/branches/eglibc-2.10/debian/patches: . any
Author: aurel32
Date: 2009-05-22 06:20:15 +0000 (Fri, 22 May 2009)
New Revision: 3522
Added:
glibc-package/branches/eglibc-2.10/debian/patches/any/local-linuxthreads-unwind.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
* Add debian/patches/any/local-linuxthreads-unwind.diff to fix exception
handling with linuxthreads.
Added: glibc-package/branches/eglibc-2.10/debian/patches/any/local-linuxthreads-unwind.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-linuxthreads-unwind.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-linuxthreads-unwind.diff 2009-05-22 06:20:15 UTC (rev 3522)
@@ -0,0 +1,79 @@
+--- a/linuxthreads/sysdeps/pthread/unwind-resume.c
++++ b/linuxthreads/sysdeps/pthread/unwind-resume.c
+@@ -0,0 +1,64 @@
++/* Copyright (C) 2003 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Jakub Jelinek <jakub@redhat.com>.
++
++ 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 <dlfcn.h>
++#include <stdio.h>
++#include <unwind.h>
++
++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);
++}
+--- a/linuxthreads/sysdeps/pthread/Makefile
++++ b/linuxthreads/sysdeps/pthread/Makefile
+@@ -1,3 +1,9 @@
++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 += timer_routines
+ CPPFLAGS += -DBROKEN_THREAD_SIGNALS
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-22 05:50:16 UTC (rev 3521)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-22 06:20:15 UTC (rev 3522)
@@ -147,6 +147,7 @@
any/local-linuxthreads-semaphore_h.diff
any/local-linuxthreads-signals.diff
any/local-linuxthreads-tst-sighandler.diff
+any/local-linuxthreads-unwind.diff
any/local-linuxthreads-weak.diff
any/local-localedef-fix-trampoline.diff
any/local-mktemp.diff
Reply to: