rpms/glibc/FC-4 glibc-linuxthreads-atomic_h.patch, NONE, 1.1 glibc.spec, 1.162, 1.163

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27120

Modified Files:
	glibc.spec 
Added Files:
	glibc-linuxthreads-atomic_h.patch 
Log Message:
2.3.6-1


glibc-linuxthreads-atomic_h.patch:
 pthread.c  |   10 +++++-----
 spinlock.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE glibc-linuxthreads-atomic_h.patch ---
2006-02-23  Jakub Jelinek  <jakub at redhat.com>

	* spinlock.h (atomic_increment): Rename to lt_atomic_increment.
	(atomic_decrement): Rename to lt_atomic_decrement.
	* pthread.c (__pthread_restart_old, __pthread_suspend_old,
	__pthread_timedsuspend_old): Adjust callers.

--- linuxthreads/spinlock.h.jj	2003-07-31 21:16:04.000000000 +0200
+++ linuxthreads/spinlock.h	2006-02-23 10:30:04.000000000 +0100
@@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock 
 
 /* Operations on pthread_atomic, which is defined in internals.h */
 
-static inline long atomic_increment(struct pthread_atomic *pa)
+static inline long lt_atomic_increment(struct pthread_atomic *pa)
 {
     long oldval;
 
@@ -184,7 +184,7 @@ static inline long atomic_increment(stru
 }
 
 
-static inline long atomic_decrement(struct pthread_atomic *pa)
+static inline long lt_atomic_decrement(struct pthread_atomic *pa)
 {
     long oldval;
 
--- linuxthreads/pthread.c.jj	2005-01-09 21:02:37.000000000 +0100
+++ linuxthreads/pthread.c	2006-02-23 10:30:04.000000000 +0100
@@ -1231,13 +1231,13 @@ void __pthread_wait_for_restart_signal(p
 
 void __pthread_restart_old(pthread_descr th)
 {
-  if (atomic_increment(&th->p_resume_count) == -1)
+  if (lt_atomic_increment(&th->p_resume_count) == -1)
     kill(th->p_pid, __pthread_sig_restart);
 }
 
 void __pthread_suspend_old(pthread_descr self)
 {
-  if (atomic_decrement(&self->p_resume_count) <= 0)
+  if (lt_atomic_decrement(&self->p_resume_count) <= 0)
     __pthread_wait_for_restart_signal(self);
 }
 
@@ -1248,7 +1248,7 @@ __pthread_timedsuspend_old(pthread_descr
   int was_signalled = 0;
   sigjmp_buf jmpbuf;
 
-  if (atomic_decrement(&self->p_resume_count) == 0) {
+  if (lt_atomic_decrement(&self->p_resume_count) == 0) {
     /* Set up a longjmp handler for the restart signal, unblock
        the signal and sleep. */
 
@@ -1305,9 +1305,9 @@ __pthread_timedsuspend_old(pthread_descr
      being delivered. */
 
   if (!was_signalled) {
-    if (atomic_increment(&self->p_resume_count) != -1) {
+    if (lt_atomic_increment(&self->p_resume_count) != -1) {
       __pthread_wait_for_restart_signal(self);
-      atomic_decrement(&self->p_resume_count); /* should be zero now! */
+      lt_atomic_decrement(&self->p_resume_count); /* should be zero now! */
       /* woke spontaneously and consumed restart signal */
       return 1;
     }


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- glibc.spec	23 Feb 2006 08:52:55 -0000	1.162
+++ glibc.spec	23 Feb 2006 09:40:47 -0000	1.163
@@ -45,6 +45,7 @@
 Patch10: glibc-nis+.patch
 Patch11: glibc-check_fds.patch
 Patch12: glibc-tls-static-size.patch
+Patch13: glibc-linuxthreads-atomic_h.patch
 Patch14: glibc-iconv-iso11548-1.patch
 Patch15: glibc-bz1877.patch
 Patch16: glibc-nscd-readall0.patch
@@ -364,6 +365,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1