Author: sthibault Date: 2014-05-02 10:51:33 +0000 (Fri, 02 May 2014) New Revision: 6034
Added: glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff Modified: glibc-package/branches/eglibc-2.19/debian/changelog glibc-package/branches/eglibc-2.19/debian/patches/series Log: hurd-i386/cvs-libpthread_guardsize.diff: Fix guardsize semantic for gcc's -fsplit-stack. Modified: glibc-package/branches/eglibc-2.19/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-02 10:43:25 UTC (rev 6033) +++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-02 10:51:33 UTC (rev 6034) @@ -88,6 +88,14 @@ -- Adam Conrad <[email protected]> Sun, 09 Feb 2014 09:46:13 -0700 +eglibc (2.18-6) UNRELEASED; urgency=medium + + [ Samuel Thibault ] + * patches/hurd-i386/cvs-libpthread_guardsize.diff: Fix guardsize semantic + for gcc's -fsplit-stack. + + -- Adam Conrad <[email protected]> Sun, 27 Apr 2014 23:15:13 -0600 + eglibc (2.18-5) unstable; urgency=medium [ Samuel Thibault ] Added: glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff (rev 0) +++ glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-libpthread_guardsize.diff 2014-05-02 10:51:33 UTC (rev 6034) @@ -0,0 +1,51 @@ +Index: eglibc-2.18/libpthread/pthread/pt-create.c +=================================================================== +--- eglibc-2.18.orig/libpthread/pthread/pt-create.c 2014-04-22 22:56:03.000000000 +0000 ++++ eglibc-2.18/libpthread/pthread/pt-create.c 2014-05-02 10:19:01.000000000 +0000 +@@ -118,12 +118,10 @@ + { + /* Allocate a stack. */ + err = __pthread_stack_alloc (&pthread->stackaddr, +- setup->stacksize); ++ setup->guardsize + setup->stacksize); + if (err) + goto failed_stack_alloc; + +- pthread->guardsize = (setup->guardsize <= setup->stacksize +- ? setup->guardsize : setup->stacksize); + pthread->stack = 1; + } + +Index: eglibc-2.18/libpthread/pthread/pt-internal.h +=================================================================== +--- eglibc-2.18.orig/libpthread/pthread/pt-internal.h 2014-04-22 22:56:03.000000000 +0000 ++++ eglibc-2.18/libpthread/pthread/pt-internal.h 2014-05-02 10:19:26.000000000 +0000 +@@ -94,11 +94,7 @@ + /* Thread stack. */ + void *stackaddr; + size_t stacksize; +- size_t guardsize; /* Included in STACKSIZE (i.e. total +- stack memory is STACKSIZE, not +- STACKSIZE + GUARDSIZE). */ +- /* FIXME: standard says that guardsize is in +- addition to stacksize. */ ++ size_t guardsize; + int stack; /* Nonzero if the stack was allocated. */ + + /* Exit status. */ +Index: eglibc-2.18/libpthread/sysdeps/generic/pt-attr-setstacksize.c +=================================================================== +--- eglibc-2.18.orig/libpthread/sysdeps/generic/pt-attr-setstacksize.c 2014-04-22 22:56:03.000000000 +0000 ++++ eglibc-2.18/libpthread/sysdeps/generic/pt-attr-setstacksize.c 2014-05-02 10:20:02.000000000 +0000 +@@ -26,11 +26,5 @@ + { + attr->stacksize = stacksize; + +- /* The guard size cannot be larger than the stack itself, as +- such, if the new stack size is smaller than the guard size, +- we squash the guard size. */ +- if (attr->guardsize > attr->stacksize) +- attr->guardsize = attr->stacksize; +- + return 0; + } Modified: glibc-package/branches/eglibc-2.19/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.19/debian/patches/series 2014-05-02 10:43:25 UTC (rev 6033) +++ glibc-package/branches/eglibc-2.19/debian/patches/series 2014-05-02 10:51:33 UTC (rev 6034) @@ -130,6 +130,7 @@ hurd-i386/tg-tls_thread_leak.diff hurd-i386/tg-mmap_file_prot_none_fix.diff hurd-i386/cvs-munmap-0.diff +hurd-i386/cvs-libpthread_guardsize.diff i386/local-biarch.diff i386/local-cmov.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
