r6405 - in glibc-package/branches/glibc-2.21/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-03-20 14:54:04 +0000 (Fri, 20 Mar 2015)
New Revision: 6405
Added:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-unwind-resume.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/series
Log:
patches/hurd-i386/cvs-unwind-resume.diff: New patch, fixes unwind-resume build.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-20 14:09:01 UTC (rev 6404)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-20 14:54:04 UTC (rev 6405)
@@ -29,6 +29,8 @@
inclusion of pthread_types.h
* patches/hurd-i386/unsubmitted-libc_alloca_cutoff.diff: New patch,
implements alloca cutoff limit.
+ * patches/hurd-i386/cvs-unwind-resume.diff: New patch, fixes unwind-resume
+ build.
* sysdeps/hurd.mk: Disable -Werror since MIG currently generates warnings.
* libc0.3.symbols.hurd-i386: Update to new version engine.
* patches/hurd-i386/{libpthread_version,
Added: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-unwind-resume.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-unwind-resume.diff (rev 0)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-unwind-resume.diff 2015-03-20 14:54:04 UTC (rev 6405)
@@ -0,0 +1,49 @@
+commit ff782688919b51476a3021400e229fef075a0237
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Feb 8 18:35:54 2015 +0100
+
+ hurd: fix unwind-resume.c build
+
+commit 28b067571e98d3047da7020014502ff2391703be
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Feb 8 18:46:00 2015 +0100
+
+ hurd: fix unwind-resume.c build
+
+diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
+index 267949e..d446804 100644
+--- a/sysdeps/gnu/unwind-resume.c
++++ b/sysdeps/gnu/unwind-resume.c
+@@ -43,9 +43,13 @@ __libgcc_s_init (void)
+ __libc_fatal (LIBGCC_S_SO
+ " must be installed for pthread_cancel to work\n");
+
++#ifdef PTR_MANGLE
+ PTR_MANGLE (resume);
++#endif
+ __libgcc_s_resume = resume;
++#ifdef PTR_MANGLE
+ PTR_MANGLE (personality);
++#endif
+ libgcc_s_personality = personality;
+ }
+
+@@ -57,7 +57,9 @@ _Unwind_Resume (struct _Unwind_Exception *exc)
+ __libgcc_s_init ();
+
+ __typeof (__libgcc_s_resume) resume = __libgcc_s_resume;
++#ifdef PTR_DEMANGLE
+ PTR_DEMANGLE (resume);
++#endif
+ (*resume) (exc);
+ }
+ #endif
+@@ -69,6 +71,8 @@ __gcc_personality_v0 PERSONALITY_PROTO
+ __libgcc_s_init ();
+
+ __typeof (libgcc_s_personality) personality = libgcc_s_personality;
++#ifdef PTR_DEMANGLE
+ PTR_DEMANGLE (personality);
++#endif
+ return (*personality) PERSONALITY_ARGS;
+ }
Modified: glibc-package/branches/glibc-2.21/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-20 14:09:01 UTC (rev 6404)
+++ glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-20 14:54:04 UTC (rev 6405)
@@ -138,6 +138,7 @@
hurd-i386/cvs-libpthread-makefile.diff
hurd-i386/unsubmitted-libc_alloca_cutoff.diff
hurd-i386/libpthread_pthread_types.diff
+hurd-i386/cvs-unwind-resume.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: