r1741 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2006-08-15 19:46:10 +0000 (Tue, 15 Aug 2006)
New Revision: 1741
Added:
glibc-package/trunk/debian/patches/any/cvs-static-getpid.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* New any/cvs-static-getpid.diff patch from upstream to fix getpid() in
statically linked programs on some architectures. (Closes: #367656).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-08-15 19:06:33 UTC (rev 1740)
+++ glibc-package/trunk/debian/changelog 2006-08-15 19:46:10 UTC (rev 1741)
@@ -40,6 +40,8 @@
that appear with 2.6.18+ kernels, and to warn users to not use sysctl().
* debian/debhelper.in/libc.postinst: update list of optimized glibc
packages. Thanks Petr Salinger. (Closes: #383168).
+ * New any/cvs-static-getpid.diff patch from upstream to fix getpid() in
+ statically linked programs on some architectures. (Closes: #367656).
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Aug 2006 21:23:07 +0200
Added: glibc-package/trunk/debian/patches/any/cvs-static-getpid.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-static-getpid.diff 2006-08-15 19:06:33 UTC (rev 1740)
+++ glibc-package/trunk/debian/patches/any/cvs-static-getpid.diff 2006-08-15 19:46:10 UTC (rev 1741)
@@ -0,0 +1,81 @@
+2005-05-20 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/i386/tls.h (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN): Define to
+ size/alignment of struct pthread rather than tcbhead_t.
+ * sysdeps/x86_64/tls.h (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN):
+ Likewise.
+ * sysdeps/s390/tls.h (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN):
+ Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/s390/tls.h,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- libc/nptl/sysdeps/s390/tls.h 2005/01/06 22:40:22 1.11
++++ libc/nptl/sysdeps/s390/tls.h 2005/05/21 19:00:27 1.12
+@@ -81,11 +81,13 @@
+ /* Get the thread descriptor definition. */
+ # include <nptl/descr.h>
+
+-/* This is the size of the initial TCB. */
+-# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
++/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
++ because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
++ struct pthread even when not linked with -lpthread. */
++# define TLS_INIT_TCB_SIZE sizeof (struct pthread)
+
+ /* Alignment requirements for the initial TCB. */
+-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
+
+ /* This is the size of the TCB. */
+ # define TLS_TCB_SIZE sizeof (struct pthread)
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/x86_64/tls.h,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- libc/nptl/sysdeps/x86_64/tls.h 2005/01/06 22:40:20 1.22
++++ libc/nptl/sysdeps/x86_64/tls.h 2005/05/21 19:00:29 1.23
+@@ -82,11 +82,13 @@
+ # endif
+ #endif
+
+-/* This is the size of the initial TCB. */
+-# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
++/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
++ because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
++ struct pthread even when not linked with -lpthread. */
++# define TLS_INIT_TCB_SIZE sizeof (struct pthread)
+
+ /* Alignment requirements for the initial TCB. */
+-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
+
+ /* This is the size of the TCB. */
+ # define TLS_TCB_SIZE sizeof (struct pthread)
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/i386/tls.h,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -r1.29 -r1.30
+--- libc/nptl/sysdeps/i386/tls.h 2005/04/26 16:11:10 1.29
++++ libc/nptl/sysdeps/i386/tls.h 2005/05/21 19:00:28 1.30
+@@ -102,11 +102,13 @@
+ /* Get the thread descriptor definition. */
+ # include <nptl/descr.h>
+
+-/* This is the size of the initial TCB. */
+-# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
++/* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t),
++ because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
++ struct pthread even when not linked with -lpthread. */
++# define TLS_INIT_TCB_SIZE sizeof (struct pthread)
+
+ /* Alignment requirements for the initial TCB. */
+-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
+
+ /* This is the size of the TCB. */
+ # define TLS_TCB_SIZE sizeof (struct pthread)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-08-15 19:06:33 UTC (rev 1740)
+++ glibc-package/trunk/debian/patches/series 2006-08-15 19:46:10 UTC (rev 1741)
@@ -134,6 +134,7 @@
any/cvs-path_log.diff -p0
any/cvs-regcomp_c.diff -p1
any/cvs-siginfo_h.diff -p1
+any/cvs-static-getpid.diff -p1
any/cvs-thread_signals.diff -p0
any/cvs-tls-crashfix.diff -p1
any/cvs-tst-setcontext_c.diff -p1
Reply to: