r2468 - in glibc-package/trunk/debian: . patches patches/hppa
Author: aurel32
Date: 2007-07-27 16:30:42 +0000 (Fri, 27 Jul 2007)
New Revision: 2468
Added:
glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* hppa/submitted-gscope_flag.diff : new patch to fix build on hppa
with NPTL.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-26 21:47:22 UTC (rev 2467)
+++ glibc-package/trunk/debian/changelog 2007-07-27 16:30:42 UTC (rev 2468)
@@ -14,8 +14,10 @@
repository, but only in the fedora branch. It has been written 8
months ago. Closes: #434484.
* sparc/submitted-gscope_flag.diff: update from upstream.
+ * hppa/submitted-gscope_flag.diff : new patch to fix build on hppa
+ with NPTL.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 26 Jul 2007 23:46:58 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 27 Jul 2007 18:30:12 +0200
glibc (2.6-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff 2007-07-27 16:30:42 UTC (rev 2468)
@@ -0,0 +1,39 @@
+2007-07-27 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/hppa/nptl/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT): Define.
+ (THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+
+--- ports/sysdeps/hppa/nptl/tls.h.orig 2007-07-27 08:17:35.000000000 -0600
++++ ports/sysdeps/hppa/nptl/tls.h 2007-07-27 08:18:39.000000000 -0600
+@@ -147,6 +147,29 @@
+ : : "r" (cr27) : "r26" );
+ }
+
++/* 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->header.gscope_flag, \
++ THREAD_GSCOPE_FLAG_UNUSED); \
++ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
++ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
++ } \
++ while (0)
++#define THREAD_GSCOPE_SET_FLAG() \
++ do \
++ { \
++ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
++ atomic_write_barrier (); \
++ } \
++ while (0)
++#define THREAD_GSCOPE_WAIT() \
++ GL(dl_wait_lookup_done) ()
++
+ #endif /* __ASSEMBLER__ */
+
+ #endif /* tls.h */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-07-26 21:47:22 UTC (rev 2467)
+++ glibc-package/trunk/debian/patches/series 2007-07-27 16:30:42 UTC (rev 2468)
@@ -50,6 +50,7 @@
arm/submitted-RTLD_SINGLE_THREAD_P.diff -p0
hppa/submitted-atomic_h.diff -p0
+hppa/submitted-gscope_flag.diff -p0
hppa/submitted-lt.diff -p0
hppa/submitted-multiple-threads.diff -p0
hppa/submitted-nptl-carlos.diff -p0
Reply to: