From: Andreas Jaeger <aj@suse.de>
Date: Thu, 7 Feb 2002 10:40:03 +0000 (+0000)
Subject: * sysdeps/mips/atomicity.h (exchange_and_add): Not use branch
X-Git-Tag: cvs/glibc-2-3~1113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22c7c5e74870d4f70f85d198cb1fedc2c29224cd;p=thirdparty%2Fglibc.git

* sysdeps/mips/atomicity.h (exchange_and_add): Not use branch

	likely.
	(atomic_add): Likewise.
	(compare_and_swap): Likewise.
	* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set):
	Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 9de06064326..a18e9d2aa17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-05  H.J. Lu  <hjl@gnu.org>
+
+	* sysdeps/mips/atomicity.h (exchange_and_add): Not use branch
+	likely.
+	(atomic_add): Likewise.
+	(compare_and_swap): Likewise.
+	* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set):
+	Likewise.
+
 2002-02-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Account for
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 7617d651fa9..d7af2dcedcd 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -16,7 +16,6 @@
 	* sysdeps/i386/tls.h: Add TLS definitions also for !FLOATING_STACKS.
 	Define THREAD_GETMEM accordingly.
 
->>>>>>> 1.469
 2002-02-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/tls.h: Include <stddef.h> for size_t.