r6266 - in glibc-package/trunk/debian: . patches/hurd-i386
Author: sthibault
Date: 2014-08-31 14:55:42 +0000 (Sun, 31 Aug 2014)
New Revision: 6266
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff
Log:
patches/hurd-i386/cvs-libpthread_guardsize.diff: Add another guard size computation fix. Fixes gcj's boehm-gc.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-30 20:35:36 UTC (rev 6265)
+++ glibc-package/trunk/debian/changelog 2014-08-31 14:55:42 UTC (rev 6266)
@@ -7,6 +7,8 @@
and submitted-bind_umask2.diff as requested by upstream.
* patches/hurd-i386/cvs-fork_ss_hang.diff: New patch which fixes some dash
hangs.
+ * patches/hurd-i386/cvs-libpthread_guardsize.diff: Add another guard size
+ computation fix. Fixes gcj's boehm-gc.
[ Aurelien Jarno ]
* debian/control.in/main: Build-Depends on dpkg (>= 1.17.11) instead of
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff 2014-08-30 20:35:36 UTC (rev 6265)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff 2014-08-31 14:55:42 UTC (rev 6266)
@@ -94,3 +94,18 @@
}
else
{
+diff --git a/libpthread/pthread/pt-getattr.c b/libpthread/pthread/pt-getattr.c
+index 24599c6..edb013f 100644
+--- a/libpthread/pthread/pt-getattr.c
++++ b/libpthread/pthread/pt-getattr.c
+@@ -39,7 +39,9 @@ pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
+ are not supported yet, so fill them with our default values. */
+ *attr = __pthread_default_attr;
+
+- attr->stackaddr = pthread->stackaddr;
++ attr->stackaddr = pthread->stackaddr +
++ ((pthread->guardsize + __vm_page_size-1)
++ / __vm_page_size * __vm_page_size);
+ attr->stacksize = pthread->stacksize;
+ attr->guardsize = pthread->guardsize;
+ attr->detachstate = (pthread->state == PTHREAD_DETACHED
Reply to: