diff --git a/ChangeLog b/ChangeLog
index 8887e68eba..51bc68b1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-02-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Add ulps for the
+	2003-11-27 atan2 test.
+
+	* sysdeps/powerpc/fpu/bits/mathinline.h (lrint, lrintf): Protect
+	with #ifndef __powerpc64__.
+
+	* sysdeps/generic/ldsodefs.h (_dl_argv, _dl_argv_internal): If
+	DL_ARGV_NOT_RELRO defined, don't use attribute_relro.
+	* sysdeps/alpha/dl-machine.h (DL_ARGV_NOT_RELRO): Remove.
+	* sysdeps/ia64/dl-machine.h (DL_ARGV_NOT_RELRO): Remove.
+	* sysdeps/sparc/sparc32/dl-machine.h (DL_ARGV_NOT_RELRO): Remove.
+	* sysdeps/sparc/sparc64/dl-machine.h (DL_ARGV_NOT_RELRO): Remove.
+	* sysdeps/alpha/dl-sysdep.h: New file.
+	* sysdeps/ia64/dl-sysdep.h: New file.
+	* sysdeps/sparc/dl-sysdep.h: New file.
+
 2004-02-19  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/generic/libc-start.c [LIBC_START_DISABLE_INLINE] (STATIC):
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b25ce57481..a6a8b49cd9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,7 +1,9 @@
 2004-02-20  Jakub Jelinek  <jakub@redhat.com>
 
-	* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Add ulps for the
-	2003-11-27 atan2 test.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+	(__syscall_error_handler2): Call CDISABLE.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+	(__syscall_error_handler2): Call CDISABLE.
 
 	* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h (DL_ARGV_NOT_RELRO): Define.
 
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index 3fcd108d67..dd3f52a989 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -58,7 +58,9 @@ ENTRY(name)								      \
 SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 	.global __errno_location;					      \
         .type   __errno_location,@function;				      \
-	call   __errno_location;					      \
+	CDISABLE;							      \
+	 mov	%l0, %o0;						      \
+	call	__errno_location;					      \
 	 nop;								      \
 	st	%l1, [%o0];						      \
 	jmpl	%i7 + 8, %g0;						      \
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index 7e6d028d76..80834292e5 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -57,7 +57,9 @@ ENTRY(name)								      \
 SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 	.global __errno_location;					      \
         .type   __errno_location,@function;				      \
-	call   __errno_location;					      \
+	CDISABLE;							      \
+	 mov	%l0, %o0;						      \
+	call	__errno_location;					      \
 	 nop;								      \
 	st	%l1, [%o0];						      \
 	jmpl	%i7 + 8, %g0;						      \
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6c9002aea1..35ea6b2c3d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-20  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/pthread/pthread_barrier_wait.c (pthread_barrier_wait):
+	Release lock before the loop, don't reacquire it.
+	* DESIGN-barrier.txt: Likewise.
+
 	* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h (DL_ARGV_NOT_RELRO): Define.
 
 2004-02-19  Andreas Schwab  <schwab@suse.de>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index 79d0305cfb..193f21013c 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -67,7 +67,9 @@ __##syscall_name##_nocancel:						      \
 SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 	.global __errno_location;					      \
         .type   __errno_location,@function;				      \
-	call   __errno_location;					      \
+	CDISABLE;							      \
+	 mov	%l0, %o0;						      \
+	call	__errno_location;					      \
 	 nop;								      \
 	st	%l1, [%o0];						      \
 	jmpl	%i7 + 8, %g0;						      \
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index efcb7dd200..cc2c2e95eb 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -61,7 +61,9 @@ __##syscall_name##_nocancel:						      \
 SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 	.global __errno_location;					      \
         .type   __errno_location,@function;				      \
-	call   __errno_location;					      \
+	CDISABLE;							      \
+	 mov	%l0, %o0;						      \
+	call	__errno_location;					      \
 	 nop;								      \
 	st	%l1, [%o0];						      \
 	jmpl	%i7 + 8, %g0;						      \