r2463 - in glibc-package/trunk/debian: . patches patches/arm
Author: aurel32
Date: 2007-07-26 15:17:43 +0000 (Thu, 26 Jul 2007)
New Revision: 2463
Added:
glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* arm/cvs-gscope_flag.diff: new patch to fix build on arm/armel.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-26 14:14:20 UTC (rev 2462)
+++ glibc-package/trunk/debian/changelog 2007-07-26 15:17:43 UTC (rev 2463)
@@ -2,8 +2,9 @@
[ Aurelien Jarno ]
* mips/cvs-gscope_flag.diff: new patch to fix build on mips/mipsel.
+ * arm/cvs-gscope_flag.diff: new patch to fix build on arm/armel.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 26 Jul 2007 16:13:38 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 26 Jul 2007 17:17:26 +0200
glibc (2.6-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff 2007-07-26 15:17:43 UTC (rev 2463)
@@ -0,0 +1,39 @@
+2007-06-06 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/arm/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/arm/nptl/tls.h 2005/11/16 19:03:42
++++ ports/sysdeps/arm/nptl/tls.h 2007/06/06 17:27:04
+@@ -132,6 +132,29 @@
+ is not available. */
+ #define TLS_INIT_TP_EXPENSIVE 1
+
++/* 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 14:14:20 UTC (rev 2462)
+++ glibc-package/trunk/debian/patches/series 2007-07-26 15:17:43 UTC (rev 2463)
@@ -43,6 +43,7 @@
amd64/local-biarch.diff
arm/cvs-gcc4-inline.diff -p0
+arm/cvs-gscope_flag.diff -p0
arm/local-ioperm.diff -p0
arm/local-no-hwcap.diff -p0
arm/submitted-RTLD_SINGLE_THREAD_P.diff -p0
Reply to: