From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 5 Feb 2003 07:10:33 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_2~196
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d45e874013d6c45bb5b77a4022555e72357eddcb;p=thirdparty%2Fglibc.git

Update.

	* atomic.h (atomic_compare_and_exchange_acq): Use
	__arch_compare_and_exchange_32_acq in return value definition.  It
	always exists.
	(atomic_bit_set): Renamed from atomic_set_bit.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 542b102f788..f018cccbb3a 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,9 @@
 2003-02-04  Ulrich Drepper  <drepper@redhat.com>
 
-	* atomic.h (atomic_bit_set): Renamed from atomic_set_bit.
+	* atomic.h (atomic_compare_and_exchange_acq): Use
+	__arch_compare_and_exchange_32_acq in return value definition.  It
+	always exists.
+	(atomic_bit_set): Renamed from atomic_set_bit.
 	Add missing atomic_ prefixes.
 
 	* sysdeps/pthread/bits/libc-lock.h (__libc_once): In case no
diff --git a/nptl/atomic.h b/nptl/atomic.h
index fe390ddf786..c8ea95f8340 100644
--- a/nptl/atomic.h
+++ b/nptl/atomic.h
@@ -27,7 +27,7 @@
 
 #ifndef atomic_compare_and_exchange_acq
 # define atomic_compare_and_exchange_acq(mem, newval, oldval) \
-  ({ __typeof (__arch_compare_and_exchange_8_acq (mem, newval, oldval))	      \
+  ({ __typeof (__arch_compare_and_exchange_32_acq (mem, newval, oldval))      \
 	 __result;							      \
      if (sizeof (*mem) == 1)						      \
        __result = __arch_compare_and_exchange_8_acq (mem, newval, oldval);    \
@@ -82,14 +82,14 @@
 #ifndef atomic_bit_set
 # define atomic_bit_set(mem, bit) \
   (void) ({ __typeof (mem) __memp = (mem);				      \
-	    while (1)							      \
-	      {								      \
-		__typeof (*mem) __oldval = *__memp;			      \
+	    __typeof (*mem) __mask = (1 << (bit));			      \
+	    __typeof (*mem) __oldval;					      \
 									      \
-		if (atomic_compare_and_exchange_acq (__memp,		      \
-						     __oldval | 1 << bit,     \
-						     __oldval) == 0)	      \
-		  break;						      \
+	    do								      \
+	      __oldval = *__memp;					      \
+	     while (atomic_compare_and_exchange_acq (__memp,		      \
+						     __oldval | __mask,	      \
+						     __oldval));	      \
 	      }})
 #endif