summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2002-02-07 10:40:03 +0000
committerAndreas Jaeger <aj@suse.de>2002-02-07 10:40:03 +0000
commit22c7c5e74870d4f70f85d198cb1fedc2c29224cd (patch)
treecd23c98146735d215a22da97b092ec21dfec6a18 /linuxthreads
parenta6049f98edbe1bbcfe62c9b7bb80a8f783c0e2b0 (diff)
downloadglibc-22c7c5e74870d4f70f85d198cb1fedc2c29224cd.tar.gz
glibc-22c7c5e74870d4f70f85d198cb1fedc2c29224cd.tar.xz
glibc-22c7c5e74870d4f70f85d198cb1fedc2c29224cd.zip
* 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.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 7617d651fa..d7af2dcedc 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.