r5179 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2012-04-01 14:43:42 +0000 (Sun, 01 Apr 2012)
New Revision: 5179
Removed:
glibc-package/trunk/debian/patches/hurd-i386/tg-unwind-resume.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/hurd-i386/tg-unwind-resume.diff: Remove patch, fixed upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-03-25 17:35:01 UTC (rev 5178)
+++ glibc-package/trunk/debian/changelog 2012-04-01 14:43:42 UTC (rev 5179)
@@ -3,6 +3,7 @@
[ Samuel Thibault ]
* patches/hurd-i386/tg-symlink_dealloc.diff: New patch from Ludovic Courtès
to fix port deallocation on symlink creation failure.
+ * patches/hurd-i386/tg-unwind-resume.diff: Remove patch, fixed upstream.
-- Aurelien Jarno <aurel32@debian.org> Mon, 27 Feb 2012 07:03:32 +0100
Deleted: glibc-package/trunk/debian/patches/hurd-i386/tg-unwind-resume.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-unwind-resume.diff 2012-03-25 17:35:01 UTC (rev 5178)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-unwind-resume.diff 2012-04-01 14:43:42 UTC (rev 5179)
@@ -1,108 +0,0 @@
-Subject: [PATCH] Unwind resume support
-
----
- sysdeps/mach/hurd/Makefile | 12 ++++++
- sysdeps/mach/hurd/rt-unwind-resume.c | 1 +
- sysdeps/mach/hurd/unwind-resume.c | 64 ++++++++++++++++++++++++++++++++++
- 3 files changed, 77 insertions(+), 0 deletions(-)
-
-diff --git a/sysdeps/mach/hurd/rt-unwind-resume.c b/sysdeps/mach/hurd/rt-unwind-resume.c
-new file mode 100644
-index 0000000..743e675
---- /dev/null
-+++ b/sysdeps/mach/hurd/rt-unwind-resume.c
-@@ -0,0 +1 @@
-+#include <unwind-resume.c>
-diff --git a/sysdeps/mach/hurd/unwind-resume.c b/sysdeps/mach/hurd/unwind-resume.c
-new file mode 100644
-index 0000000..088f4c6
---- /dev/null
-+++ b/sysdeps/mach/hurd/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);
-+}
-diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
-index 93058ff..c0b1400 100644
---- a/sysdeps/mach/hurd/Makefile
-+++ b/sysdeps/mach/hurd/Makefile
-@@ -207,4 +207,16 @@ sysdep_headers += net/ethernet.h net/if_arp.h net/if_ether.h net/if_ppp.h \
- 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
---
-tg: (0234227..) t/unwind-resume (depends on: baseline)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2012-03-25 17:35:01 UTC (rev 5178)
+++ glibc-package/trunk/debian/patches/series 2012-04-01 14:43:42 UTC (rev 5179)
@@ -132,7 +132,6 @@
hurd-i386/tg-itimer-lock.diff
hurd-i386/tg-pthread_types.diff
hurd-i386/tg-_dl_random.diff
-hurd-i386/tg-unwind-resume.diff
hurd-i386/tg-null-pathname.diff
hurd-i386/tg-sbrk.diff
hurd-i386/tg-thread-cancel.diff
Reply to: