r2471 - in glibc-package/trunk/debian: . patches patches/any patches/hppa
Author: aurel32
Date: 2007-07-28 22:01:58 +0000 (Sat, 28 Jul 2007)
New Revision: 2471
Added:
glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff
glibc-package/trunk/debian/patches/hppa/local-linuxthreads-gscope.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* debian/patches/any/local-linuxthreads-gscope.diff: new patch to add
gscope support to linuxthreads.
* debian/patches/hppa/local-linuxthreads-gscope.diff: new patch to fix build
on hppa with linuxthreads. Closes: #434799.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-28 08:20:46 UTC (rev 2470)
+++ glibc-package/trunk/debian/changelog 2007-07-28 22:01:58 UTC (rev 2471)
@@ -11,8 +11,12 @@
* sparc/submitted-gscope_flag.diff: update from upstream.
* hppa/submitted-gscope_flag.diff : new patch to fix build on hppa
with NPTL.
+ * debian/patches/any/local-linuxthreads-gscope.diff: new patch to add
+ gscope support to linuxthreads.
+ * debian/patches/hppa/local-linuxthreads-gscope.diff: new patch to fix build
+ on hppa with linuxthreads. Closes: #434799.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 28 Jul 2007 10:20:03 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 29 Jul 2007 00:00:31 +0200
glibc (2.6-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-gscope.diff 2007-07-28 22:01:58 UTC (rev 2471)
@@ -0,0 +1,31 @@
+--- linuxthreads/descr.h 2007-07-28 15:54:52.000000000 -0600
++++ linuxthreads/descr.h 2007-07-28 15:55:51.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <hp-timing.h>
++#include <lowlevellock.h>
+ #include <tls.h>
+
+ /* Fast thread-specific data internal to libc. */
+@@ -123,10 +124,12 @@
+ uintptr_t sysinfo;
+ uintptr_t stack_guard;
+ uintptr_t pointer_guard;
++ int gscope_flag;
+ } data;
+ void *__padding[16];
+ } p_header;
+ # define p_multiple_threads p_header.data.multiple_threads
++# 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. */
+
+ /* This member must be last. */
Added: glibc-package/trunk/debian/patches/hppa/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-linuxthreads-gscope.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/local-linuxthreads-gscope.diff 2007-07-28 22:01:58 UTC (rev 2471)
@@ -0,0 +1,32 @@
+--- ports/sysdeps/hppa/linuxthreads/tls.h 2006-04-18 23:35:34.000000000 -0600
++++ ports/sysdeps/hppa/linuxthreads/tls.h 2007-07-28 15:55:51.000000000 -0600
+@@ -100,6 +100,29 @@
+ #define THREAD_SETMEM_NC(descr, member, value) \
+ ((void) sizeof (descr), THREAD_SELF->member = (value))
+
++/* Get and set the global scope generation counter in struct pthread. */
++#define THREAD_GSCOPE_FLAG_UNUSED 0
++#define THREAD_GSCOPE_FLAG_USED 1
++#define THREAD_GSCOPE_FLAG_WAIT 2
++#define THREAD_GSCOPE_RESET_FLAG() \
++ do \
++ { int __res \
++ = atomic_exchange_rel (&THREAD_SELF->p_gscope_flag, \
++ THREAD_GSCOPE_FLAG_UNUSED); \
++ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
++ lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1); \
++ } \
++ while (0)
++#define THREAD_GSCOPE_SET_FLAG() \
++ do \
++ { \
++ THREAD_SELF->p_gscope_flag = THREAD_GSCOPE_FLAG_USED; \
++ atomic_write_barrier (); \
++ } \
++ while (0)
++#define THREAD_GSCOPE_WAIT() \
++ GL(dl_wait_lookup_done) ()
++
+ /* Install the dtv pointer. The pointer passed is to the element with
+ index -1 which contain the length. */
+ # define INSTALL_DTV(tcbp, dtvp) \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-07-28 08:20:46 UTC (rev 2470)
+++ glibc-package/trunk/debian/patches/series 2007-07-28 22:01:58 UTC (rev 2471)
@@ -58,6 +58,7 @@
hppa/submitted-ustat.diff -p0
hppa/local-inlining.diff -p0
hppa/local-linuxthreads.diff -p0
+hppa/local-linuxthreads-gscope.diff -p0
hurd-i386/local-dl-dynamic-weak.diff
hurd-i386/local-enable-ldconfig.diff -p0
@@ -124,6 +125,7 @@
any/local-libgcc-compat-main.diff -p0
any/local-libgcc-compat-ports.diff -p0
any/local-linuxthreads-defines.diff -p0
+any/local-linuxthreads-gscope.diff -p0
any/local-linuxthreads-lowlevellock.diff -p0
any/local-linuxthreads-fatalprepare.diff -p0
any/local-linuxthreads-semaphore_h.diff
Reply to: