r890 - in glibc-package/branches/glibc-2.3.4/debian: . patches
Author: gotom
Date: 2005-04-16 12:06:56 +0000 (Sat, 16 Apr 2005)
New Revision: 890
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch
glibc-package/branches/glibc-2.3.4/debian/shlibver
Log:
- debian/shlibver: Bump up to 2.3.5-1.
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 12:05:52 UTC (rev 889)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 12:06:56 UTC (rev 890)
@@ -3,6 +3,7 @@
* GOTO Masanori <gotom@debian.org>
* New upstream release.
+ - debian/shlibver: Bump up to 2.3.5-1.
* Merge with 2.3.2.ds1-21, added:
- debian/patches/linuxthreads-sizefix.dpatch: Added.
Modified: glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch 2005-04-16 12:05:52 UTC (rev 889)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch 2005-04-16 12:06:56 UTC (rev 890)
@@ -8,7 +8,7 @@
# DP: Patch author: Jakub Jelinek <jakub@redhat.com>
# DP: Upstream status: Debian-Specific
# DP: Status Details: Currently IA-64 part is applied.
-# DP: Date: 2005-04-09
+# DP: Date: 2005-04-09, 2005-04-16 updated by gotom
PATCHLEVEL=1
@@ -89,6 +89,115 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
$(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a
+--- glibc-2.3.2-net/linuxthreads/sysdeps/alpha/tls.h 5 Feb 2003 09:13:41 -0000 1.1.1.4
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/alpha/tls.h 12 Aug 2003 11:35:57 -0000 1.5
+@@ -53,54 +53,76 @@ typedef struct
+ # include <sysdep.h>
+
+ /* This is the size of the initial TCB. */
+-# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
++# define TLS_INIT_TCB_SIZE 0
+
+ /* Alignment requirements for the initial TCB. */
+-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++# define TLS_INIT_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+
+ /* This is the size of the TCB. */
+-# define TLS_TCB_SIZE sizeof (tcbhead_t)
++# define TLS_TCB_SIZE 0
+
+ /* Alignment requirements for the TCB. */
+-# define TLS_TCB_ALIGN __alignof__ (tcbhead_t)
++# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+
+ /* This is the size we need before TCB. */
+-# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_PRE_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) \
++ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_PRE_TCB_SIZE \
++ ((sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) \
++ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
++# endif
+
+ /* The DTV is allocated at the TP; the TCB is placed elsewhere. */
+ # define TLS_DTV_AT_TP 1
+
++/* The following assumes that TP (R2 or R13) points to the end of the
++ TCB + 0x7000 (per the ABI). This implies that TCB address is
++ TP - 0x7000. As we define TLS_DTV_AT_TP we can
++ assume that the pthread struct is allocated immediately ahead of the
++ TCB. This implies that the pthread_descr address is
++ TP - (TLS_PRE_TCB_SIZE + 0x7000). */
++/* ??? PPC uses offset 0x7000; seems like a good idea for alpha too,
++ but binutils not yet changed to match. */
++# define TLS_TCB_OFFSET 0
++
+ /* Install the dtv pointer. The pointer passed is to the element with
+ index -1 which contain the length. */
+ # define INSTALL_DTV(TCBP, DTVP) \
+- (((tcbhead_t *) (TCBP))->dtv = (DTVP) + 1)
++ (((tcbhead_t *) (TCBP))[-1].dtv = (DTVP) + 1)
+
+ /* Install new dtv for current thread. */
+ # define INSTALL_NEW_DTV(DTV) \
+- (((tcbhead_t *)__builtin_thread_pointer ())->dtv = (DTV))
++ (THREAD_DTV() = (DTV))
+
+ /* Return dtv of given thread descriptor. */
+ # define GET_DTV(TCBP) \
+- (((tcbhead_t *) (TCBP))->dtv)
++ (((tcbhead_t *) (TCBP))[-1].dtv)
+
+ /* Code to initially initialize the thread pointer. This might need
+ special attention since 'errno' is not yet available and if the
+ operation can cause a failure 'errno' must not be touched. */
+ # define TLS_INIT_TP(TCBP, SECONDCALL) \
+- (__builtin_set_thread_pointer (TCBP), 0)
++ (__builtin_set_thread_pointer ((void *) (TCBP) + TLS_TCB_OFFSET), NULL)
+
+ /* Return the address of the dtv for the current thread. */
+ # define THREAD_DTV() \
+- (((tcbhead_t *)__builtin_thread_pointer ())->dtv)
++ (((tcbhead_t *) (__builtin_thread_pointer () - TLS_TCB_OFFSET))[-1].dtv)
+
+ /* Return the thread descriptor for the current thread. */
+ # undef THREAD_SELF
+ # define THREAD_SELF \
+- ((pthread_descr)__builtin_thread_pointer () - 1)
++ ((pthread_descr) (__builtin_thread_pointer () \
++ - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE))
+
+ # undef INIT_THREAD_SELF
+ # define INIT_THREAD_SELF(DESCR, NR) \
+- __builtin_set_thread_pointer ((struct _pthread_descr_struct *)(DESCR) + 1)
++ __builtin_set_thread_pointer ((char *)(DESCR) \
++ + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
+
+ /* Get the thread descriptor definition. */
+ # include <linuxthreads/descr.h>
+--- glibc-2.3.2-net/linuxthreads/sysdeps/i386/tls.h 13 May 2003 19:51:58 -0000 1.1.1.18
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/i386/tls.h 28 Jul 2003 10:42:00 -0000 1.14
+@@ -81,7 +81,14 @@ typedef struct
+ # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+
+ /* This is the size of the TCB. */
+-# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE)
++# endif
+
+ /* Alignment requirements for the TCB. */
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-2.3.2-net/linuxthreads/sysdeps/ia64/tls.h 31 Jul 2003 23:17:32 -0000 1.1.1.6
+++ glibc-2.3.2-redhat/linuxthreads/sysdeps/ia64/tls.h 31 Jul 2003 23:26:38 -0000 1.5
@@ -59,7 +59,14 @@ typedef struct
@@ -107,6 +216,30 @@
/* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+--- glibc-2.3.2-net/linuxthreads/sysdeps/powerpc/tls.h 26 Apr 2003 08:30:11 -0000 1.1.1.4
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/powerpc/tls.h 28 Jul 2003 10:42:00 -0000 1.2
+@@ -64,11 +64,19 @@ typedef struct
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+
+ /* This is the size we need before TCB. */
+-# define TLS_PRE_TCB_SIZE \
++# ifndef IS_IN_rtld
++# define TLS_PRE_TCB_SIZE \
+ (sizeof (struct _pthread_descr_struct) \
+ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_PRE_TCB_SIZE \
++ ((sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) \
++ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
++# endif
+
+-/* The following assumes that TP (R2 or R13) is points to the end of the
++/* The following assumes that TP (R2 or R13) points to the end of the
+ TCB + 0x7000 (per the ABI). This implies that TCB address is
+ TP - 0x7000. As we define TLS_DTV_AT_TP we can
+ assume that the pthread_descr is allocated immediately ahead of the
--- glibc-2.3.2-net/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 13:32:49 -0000 1.1.1.6
+++ glibc-2.3.2-redhat/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 14:10:45 -0000 1.8
@@ -12,3 +12,15 @@ endif
@@ -141,6 +274,78 @@
+#ifdef HAVE_TLS_SUPPORT
+NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread)
+#endif
+--- glibc-2.3.2-net/linuxthreads/sysdeps/s390/tls.h 5 Feb 2003 09:13:41 -0000 1.1.1.3
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/s390/tls.h 28 Jul 2003 10:42:00 -0000 1.3
+@@ -72,7 +72,14 @@ typedef struct
+ # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+
+ /* This is the size of the TCB. */
+-# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE)
++# endif
+
+ /* Alignment requirements for the TCB. */
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+--- glibc-2.3.2-net/linuxthreads/sysdeps/sh/tls.h 3 Mar 2003 11:22:41 -0000 1.1.1.8
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/sh/tls.h 28 Jul 2003 10:42:00 -0000 1.2
+@@ -64,7 +64,14 @@ typedef struct
+ # define TLS_TCB_SIZE sizeof (tcbhead_t)
+
+ /* This is the size we need before TCB. */
+-# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_PRE_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE)
++# endif
+
+ /* Alignment requirements for the TCB. */
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+--- glibc-2.3.2-net/linuxthreads/sysdeps/sparc/tls.h 5 Feb 2003 09:13:41 -0000 1.1.1.3
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/sparc/tls.h 2 Sep 2003 11:54:06 -0000 1.2
+@@ -64,7 +64,14 @@ typedef struct
+ # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+
+ /* This is the size of the TCB. */
+-# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE)
++# endif
+
+ /* Alignment requirements for the TCB. */
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
+--- glibc-2.3.2-net/linuxthreads/sysdeps/x86_64/tls.h 18 Jun 2003 17:37:28 -0000 1.1.1.4
++++ glibc-2.3.2-redhat/linuxthreads/sysdeps/x86_64/tls.h 28 Jul 2003 10:42:00 -0000 1.2
+@@ -63,7 +63,14 @@ typedef struct
+ # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+
+ /* This is the size of the TCB. */
+-# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# ifndef IS_IN_rtld
++# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
++# else
++# include <nptl-struct-pthread.h>
++# define TLS_TCB_SIZE \
++ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \
++ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE)
++# endif
+
+ /* Alignment requirements for the TCB. */
+ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-2.3.2-net/nptl/Makefile 4 Oct 2003 11:53:45 -0000 1.1.1.67
+++ glibc-2.3.2-redhat/nptl/Makefile 4 Oct 2003 12:06:23 -0000 1.72
@@ -465,15 +465,19 @@ $(addprefix $(objpfx), \
Modified: glibc-package/branches/glibc-2.3.4/debian/shlibver
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/shlibver 2005-04-16 12:05:52 UTC (rev 889)
+++ glibc-package/branches/glibc-2.3.4/debian/shlibver 2005-04-16 12:06:56 UTC (rev 890)
@@ -1 +1 @@
-shlib_dep_ver = 2.3.4-1
+shlib_dep_ver = 2.3.5-1
Reply to: