r2473 - glibc-package/trunk/debian/patches/any

[aurel32@alioth.debian.org]

Author: aurel32
Date: 2007-07-29 13:49:59 +0000 (Sun, 29 Jul 2007)
New Revision: 2473

Modified:
   glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff
Log:
Fix local-linuxthreads-gscope.diff



Modified: glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff	2007-07-29 00:38:28 UTC (rev 2472)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff	2007-07-29 13:49:59 UTC (rev 2473)
@@ -1,5 +1,5 @@
---- linuxthreads/descr.h	2007-07-28 15:54:52.000000000 -0600
-+++ linuxthreads/descr.h	2007-07-28 15:55:51.000000000 -0600
+--- linuxthreads/descr.h.orig	2007-07-29 15:45:26.000000000 +0200
++++ linuxthreads/descr.h	2007-07-29 15:47:11.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <stdint.h>
  #include <sys/types.h>
@@ -8,7 +8,7 @@
  #include <tls.h>
  
  /* Fast thread-specific data internal to libc.  */
-@@ -123,10 +124,12 @@
+@@ -123,12 +124,15 @@
        uintptr_t sysinfo;
        uintptr_t stack_guard;
        uintptr_t pointer_guard;
@@ -20,12 +20,7 @@
 +# define p_gscope_flag p_header.data.gscope_flag
  #elif TLS_MULTIPLE_THREADS_IN_TCB
    int p_multiple_threads;
- #endif
-@@ -189,6 +192,7 @@
- #endif
-   size_t p_alloca_cutoff;	/* Maximum size which should be allocated
- 				   using alloca() instead of malloc().  */
 +  int p_gscope_flag;
-   /* New elements must be added at the end.  */
+ #endif
  
-   /* This member must be last.  */
+   pthread_descr p_nextlive, p_prevlive;