r3718 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2009-07-30 00:32:29 +0000 (Thu, 30 Jul 2009)
New Revision: 3718
Added:
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/local-unwind-resume.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
* Add debian/patches/hurd-i386/local-unwind-resume.diff to fix build on
hurd-i386.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-30 00:09:39 UTC (rev 3717)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-30 00:32:29 UTC (rev 3718)
@@ -111,6 +111,8 @@
[ Samuel Thibault ]
* Add debian/patches/hurd-i386/local-_dl_random.diff to fix build on
hurd-i386.
+ * Add debian/patches/hurd-i386/local-unwind-resume.diff to fix build on
+ hurd-i386.
* Fix debian/patches/hurd-i386/local-tls-support.diff to align up includes
on Linux, to fix build.
Added: glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/local-unwind-resume.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/local-unwind-resume.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/local-unwind-resume.diff 2009-07-30 00:32:29 UTC (rev 3718)
@@ -0,0 +1,109 @@
+---
+ Makefile | 12 +++++++++
+ rt-unwind-resume.c | 1
+ unwind-resume.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 77 insertions(+)
+
+Index: sysdeps/mach/hurd/rt-unwind-resume.c
+===================================================================
+RCS file: sysdeps/mach/hurd/rt-unwind-resume.c
+diff -N sysdeps/mach/hurd/rt-unwind-resume.c
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ sysdeps/mach/hurd/rt-unwind-resume.c 30 Jul 2009 00:21:33 -0000
+@@ -0,0 +1 @@
++#include <unwind-resume.c>
+Index: sysdeps/mach/hurd/unwind-resume.c
+===================================================================
+RCS file: sysdeps/mach/hurd/unwind-resume.c
+diff -N sysdeps/mach/hurd/unwind-resume.c
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ 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 <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);
++}
+Index: sysdeps/mach/hurd/Makefile
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/Makefile,v
+retrieving revision 1.96
+diff -u -p -r1.96 Makefile
+--- sysdeps/mach/hurd/Makefile 7 Jan 2009 01:59:31 -0000 1.96
++++ 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
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-30 00:09:39 UTC (rev 3717)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-30 00:32:29 UTC (rev 3718)
@@ -95,6 +95,7 @@
hurd-i386/submitted-itimer-lock.diff
hurd-i386/local-pthread_types.diff
hurd-i386/local-_dl_random.diff
+hurd-i386/local-unwind-resume.diff
ia64/submitted-memchr.diff
ia64/submitted-sysconf.diff
Reply to: