* 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 9de06064326a37b355e113431957aa87baaffd7b..a18e9d2aa17f40bbc83e07d74cf3c97cd00e9f4b 100644 (file)
--- 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 7617d651fa9b35cd54c1c0817a1bc38cf1670d90..d7af2dcedcd6dcfe4650fd2a212c831759c44340 100644 (file)
--- 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.