r2499 - in glibc-package/trunk/debian: . patches patches/arm patches/hppa patches/mips
Author: aurel32
Date: 2007-08-06 21:29:23 +0000 (Mon, 06 Aug 2007)
New Revision: 2499
Removed:
glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff
glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff
glibc-package/trunk/debian/patches/mips/cvs-gscope_flag.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Remove arm/cvs-gscope_flag.diff (merged upstream).
* Remove hppa/submitted-gscope_flag.diff (merged upstream).
* Remove mips/cvs-gscope_flag.diff (merged upstream).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-08-06 21:27:07 UTC (rev 2498)
+++ glibc-package/trunk/debian/changelog 2007-08-06 21:29:23 UTC (rev 2499)
@@ -8,6 +8,9 @@
* Remove any/cvs-glibc-2_6-branch.diff (merged upstream).
* Remove any/cvs-printf_fp.c.diff (merged upstream).
* Remove sparc/submitted-gscope_flag.diff (merged upstream).
+ * Remove arm/cvs-gscope_flag.diff (merged upstream).
+ * Remove hppa/submitted-gscope_flag.diff (merged upstream).
+ * Remove mips/cvs-gscope_flag.diff (merged upstream).
* any/local-bindresvport_blacklist.diff: patch from openSUSE to
add support for /etc/bindresvport.blacklist.
* debian/local/etc/bindresvport.blacklist: new default configuration
@@ -18,7 +21,7 @@
[ Samuel Thibault ]
* hurd-i386/local-gscope.diff: resync, mostly merged upstream.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 06 Aug 2007 23:25:42 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 06 Aug 2007 23:28:06 +0200
glibc (2.6-5) unstable; urgency=low
Deleted: glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff 2007-08-06 21:27:07 UTC (rev 2498)
+++ glibc-package/trunk/debian/patches/arm/cvs-gscope_flag.diff 2007-08-06 21:29:23 UTC (rev 2499)
@@ -1,39 +0,0 @@
-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 */
Deleted: glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff 2007-08-06 21:27:07 UTC (rev 2498)
+++ glibc-package/trunk/debian/patches/hppa/submitted-gscope_flag.diff 2007-08-06 21:29:23 UTC (rev 2499)
@@ -1,39 +0,0 @@
-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 */
Deleted: glibc-package/trunk/debian/patches/mips/cvs-gscope_flag.diff
===================================================================
--- glibc-package/trunk/debian/patches/mips/cvs-gscope_flag.diff 2007-08-06 21:27:07 UTC (rev 2498)
+++ glibc-package/trunk/debian/patches/mips/cvs-gscope_flag.diff 2007-08-06 21:29:23 UTC (rev 2499)
@@ -1,40 +0,0 @@
-2007-06-06 Daniel Jacobowitz <dan@codesourcery.com>
-
- * sysdeps/mips/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/mips/nptl/tls.h.orig 2005-03-28 11:19:38.000000000 +0200
-+++ ports/sysdeps/mips/nptl/tls.h 2007-06-06 19:27:04.000000000 +0200
-@@ -156,6 +156,29 @@
- different value to mean unset l_tls_offset. */
- # define NO_TLS_OFFSET -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-08-06 21:27:07 UTC (rev 2498)
+++ glibc-package/trunk/debian/patches/series 2007-08-06 21:29:23 UTC (rev 2499)
@@ -42,14 +42,12 @@
amd64/local-linuxthreads-gscope.diff -p0
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
hppa/submitted-atomic_h.diff -p0
hppa/submitted-fadvise64_64.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
@@ -89,7 +87,6 @@
m68k/local-pthread_lock.diff
m68k/submitted-gcc34-seccomment.diff -p0
-mips/cvs-gscope_flag.diff -p0
mips/local-lazy-eval.diff -p0
powerpc/local-sysconf.diff
Reply to: