r2098 - in glibc-package/branches/glibc-branch-etch/debian: . patches patches/alpha
Author: aurel32
Date: 2007-04-19 22:11:52 +0000 (Thu, 19 Apr 2007)
New Revision: 2098
Added:
glibc-package/branches/glibc-branch-etch/debian/patches/alpha/local-waitpid-not-cancel.diff
Modified:
glibc-package/branches/glibc-branch-etch/debian/changelog
glibc-package/branches/glibc-branch-etch/debian/patches/series
Log:
* debian/patches/alpha/local-waitpid-not-cancel.diff: new patch (fix defunct
threads on alpha) from Uwe Schindler. Closes: #325600.
Modified: glibc-package/branches/glibc-branch-etch/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-etch/debian/changelog 2007-04-19 22:00:49 UTC (rev 2097)
+++ glibc-package/branches/glibc-branch-etch/debian/changelog 2007-04-19 22:11:52 UTC (rev 2098)
@@ -12,8 +12,10 @@
a wrong assertion in nss_nis_setnetgrent. Closes: #369536.
* patches/any/submitted-gethostbyname_r.diff: new patch to fix unaligned
memory access in gethostbyname_r.diff(). Closes: #419459.
+ * debian/patches/alpha/local-waitpid-not-cancel.diff: new patch (fix defunct
+ threads on alpha) from Uwe Schindler. Closes: #325600.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 16 Apr 2007 22:51:12 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 20 Apr 2007 00:09:51 +0200
glibc (2.3.6.ds1-13) unstable; urgency=low
Added: glibc-package/branches/glibc-branch-etch/debian/patches/alpha/local-waitpid-not-cancel.diff
===================================================================
--- glibc-package/branches/glibc-branch-etch/debian/patches/alpha/local-waitpid-not-cancel.diff 2007-04-19 22:00:49 UTC (rev 2097)
+++ glibc-package/branches/glibc-branch-etch/debian/patches/alpha/local-waitpid-not-cancel.diff 2007-04-19 22:11:52 UTC (rev 2098)
@@ -0,0 +1,17 @@
+diff -ur sysdeps/unix/sysv/linux/not-cancel.h sysdeps/unix/sysv/linux/not-cancel.h
+--- sysdeps/unix/sysv/linux/not-cancel.h 2003-09-04 16:05:12.000000000 +0200
++++ sysdeps/unix/sysv/linux/not-cancel.h 2007-04-19 13:46:59.000000000 +0200
+@@ -55,6 +55,11 @@
+ # define waitpid_not_cancel(pid, stat_loc, options) \
+ INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options)
+ #else
+-# define waitpid_not_cancel(pid, stat_loc, options) \
+- INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
++# if defined(__alpha__)
++# define waitpid_not_cancel(pid, stat_loc, options) \
++ wait4(pid, stat_loc, options, NULL)
++# else
++# define waitpid_not_cancel(pid, stat_loc, options) \
++ INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
++# endif
+ #endif
Modified: glibc-package/branches/glibc-branch-etch/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-etch/debian/patches/series 2007-04-19 22:00:49 UTC (rev 2097)
+++ glibc-package/branches/glibc-branch-etch/debian/patches/series 2007-04-19 22:11:52 UTC (rev 2098)
@@ -49,6 +49,7 @@
#alpha/submitted-pic.diff -p0 # g: suspended
alpha/cvs-gcc4-profile.diff -p0
alpha/local-gcc4.1.diff -p0
+alpha/local-waitpid-not-cancel.diff -p0
alpha/submitted-xstat.diff -p0
amd64/local-biarch.diff -p1
Reply to: