[commits] r7154 - in /fsf/trunk/libc: ./ elf/ sysdeps/unix/sysv/linux/alpha/sys/ sysdeps/unix/sysv/linux/sparc/sys/ sysdeps/unix/sysv/...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Oct 17 00:03:13 2008
New Revision: 7154

Log:
Import glibc-mainline for 2008-10-17

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/dl-tls.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/sys/signalfd.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/signalfd.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/signalfd.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Oct 17 00:03:13 2008
@@ -1,3 +1,14 @@
+2008-10-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* elf/dl-tls.c (_dl_update_slotinfo): Copy all of the initial DTV.
+
+2008-10-16  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sys/signalfd.h (signalfd): Fix __THROW vs.
+	__nonnull order for C++.
+	* sysdeps/unix/sysv/linux/alpha/sys/signalfd.h (signalfd): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/signalfd.h (signalfd): Likewise.
+
 2008-10-01  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
 
 	* stdlib/longlong.h: Update from GCC.

Modified: fsf/trunk/libc/elf/dl-tls.c
==============================================================================
--- fsf/trunk/libc/elf/dl-tls.c (original)
+++ fsf/trunk/libc/elf/dl-tls.c Fri Oct 17 00:03:13 2008
@@ -634,7 +634,7 @@
 		      newp = malloc ((2 + newsize) * sizeof (dtv_t));
 		      if (newp == NULL)
 			oom ();
-		      memcpy (newp, &dtv[-1], oldsize * sizeof (dtv_t));
+		      memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t));
 		    }
 		  else
 		    {

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/sys/signalfd.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/sys/signalfd.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/sys/signalfd.h Fri Oct 17 00:03:13 2008
@@ -59,7 +59,7 @@
 /* Request notification for delivery of signals in MASK to be
    performed using descriptor FD.*/
 extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __nonnull ((2)) __THROW;
+  __THROW __nonnull ((2));
 
 __END_DECLS
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/signalfd.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/signalfd.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/signalfd.h Fri Oct 17 00:03:13 2008
@@ -59,7 +59,7 @@
 /* Request notification for delivery of signals in MASK to be
    performed using descriptor FD.*/
 extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __nonnull ((2)) __THROW;
+  __THROW __nonnull ((2));
 
 __END_DECLS
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/signalfd.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/signalfd.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/signalfd.h Fri Oct 17 00:03:13 2008
@@ -59,7 +59,7 @@
 /* Request notification for delivery of signals in MASK to be
    performed using descriptor FD.*/
 extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __nonnull ((2)) __THROW;
+  __THROW __nonnull ((2));
 
 __END_DECLS