r1937 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2007-02-05 07:57:44 +0100 (Mon, 05 Feb 2007)
New Revision: 1937
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* patches/any/local-linuxthreads-sigprocmask.diff: new patch (fix build of
linuxthreads on linux architectures).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 06:29:38 UTC (rev 1936)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 06:57:44 UTC (rev 1937)
@@ -88,6 +88,8 @@
* patches/any/cvs-2.5-branch-update.diff: new patch (2.5 branch update) from
upstream CVS.
* debhelper.in/locales.templates: recommends UTF-8 locales by default.
+ * patches/any/local-linuxthreads-sigprocmask.diff: new patch (fix build of
+ linuxthreads on linux architectures).
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
@@ -107,7 +109,7 @@
* Update localedata/fix-lang.diff
* Update localedata/first_weekday.diff
- -- Aurelien Jarno <aurel32@debian.org> Mon, 5 Feb 2007 06:11:54 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 5 Feb 2007 07:56:58 +0100
glibc (2.4-1) UNRELEASED; urgency=low
Added: glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff 2007-02-05 06:29:38 UTC (rev 1936)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff 2007-02-05 06:57:44 UTC (rev 1937)
@@ -0,0 +1,38 @@
+--- linuxthreads/sysdeps/pthread/gai_misc.h.orig 2007-02-05 07:51:33.000000000 +0100
++++ linuxthreads/sysdeps/pthread/gai_misc.h 2007-02-05 07:55:01.000000000 +0100
+@@ -34,7 +34,12 @@
+ {
+ sigset_t ss;
+ sigemptyset (&ss);
++#ifdef __linux__
++ INTERNAL_SYSCALL_DECL (err);
++ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8);
++#else
+ __sigprocmask (SIG_SETMASK, &ss, NULL);
++#endif
+ }
+
+ extern inline int
+@@ -55,12 +60,22 @@
+ sigset_t ss;
+ sigset_t oss;
+ sigfillset (&ss);
++#ifdef __linux__
++ INTERNAL_SYSCALL_DECL (err);
++ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);
++#else
+ __sigprocmask (SIG_SETMASK, &ss, &oss);
++#endif
+
+ int ret = pthread_create (threadp, &attr, tf, arg);
+
+ /* Restore the signal mask. */
++#ifdef __linux__
++ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &oss, NULL,
++ _NSIG / 8);
++#else
+ __sigprocmask (SIG_SETMASK, &oss, NULL);
++#endif
+
+ (void) pthread_attr_destroy (&attr);
+ return ret;
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-05 06:29:38 UTC (rev 1936)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-05 06:57:44 UTC (rev 1937)
@@ -111,6 +111,7 @@
any/local-libgcc-compat-main.diff -p0
any/local-libgcc-compat-ports.diff -p0
any/local-linuxthreads-semaphore_h.diff -p1
+any/local-linuxthreads-sigprocmask.diff -p0
any/local-linuxthreads-tst-sighandler.diff -p1
any/local-localedef-fix-trampoline.diff -p1
any/local-makeconfig.diff -p0
Reply to: