[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r14285 - in /branches/eglibc-2_14: libc/ libc/nptl/ libc/resolv/ libc/sysdeps/posix/ libc/sysdeps/unix/sysv/linux/ libc/sysd...



Author: joseph
Date: Tue Jun 21 08:43:34 2011
New Revision: 14285

Log:
Merge changes between r14269 and r14284 from /fsf/glibc-2_14-branch.

Added:
    branches/eglibc-2_14/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
      - copied unchanged from r14284, fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S
      - copied unchanged from r14284, fsf/glibc-2_14-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S
      - copied unchanged from r14284, fsf/glibc-2_14-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
      - copied unchanged from r14284, fsf/glibc-2_14-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c
Modified:
    branches/eglibc-2_14/libc/ChangeLog
    branches/eglibc-2_14/libc/nptl/ChangeLog
    branches/eglibc-2_14/libc/nptl/pthread_rwlock_init.c
    branches/eglibc-2_14/libc/resolv/res_send.c
    branches/eglibc-2_14/libc/sysdeps/posix/getaddrinfo.c
    branches/eglibc-2_14/libc/sysdeps/unix/sysv/linux/check_native.c
    branches/eglibc-2_14/ports/ChangeLog.arm
    branches/eglibc-2_14/ports/ChangeLog.mips
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h

Modified: branches/eglibc-2_14/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_14/libc/ChangeLog (original)
+++ branches/eglibc-2_14/libc/ChangeLog Tue Jun 21 08:43:34 2011
@@ -1,3 +1,22 @@
+2011-06-15  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* resolv/res_send.c (__libc_res_nsend): Fix typos in last patch.  We
+	need to dereference resplen2.
+
+2011-06-14  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c: New file.
+
+2011-06-14  Andreas Jaeger  <aj@xxxxxxx>
+
+	* sysdeps/unix/sysv/linux/check_native.c: Include <string.h> for
+	memset declaration.
+
+2011-06-10  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix logic allocating
+	tmpbuf.
+
 2011-06-07  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/sparc/sparc32/dl-irel.h (elf_irela): Pass dl_hwcap to

Modified: branches/eglibc-2_14/libc/nptl/ChangeLog
==============================================================================
--- branches/eglibc-2_14/libc/nptl/ChangeLog (original)
+++ branches/eglibc-2_14/libc/nptl/ChangeLog Tue Jun 21 08:43:34 2011
@@ -1,3 +1,7 @@
+2011-06-14  Andreas Jaeger  <aj@xxxxxxx>
+
+	* pthread_rwlock_init.c: Include <string.h> for memset declaration.
+
 2011-05-11  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #386]

Modified: branches/eglibc-2_14/libc/nptl/pthread_rwlock_init.c
==============================================================================
--- branches/eglibc-2_14/libc/nptl/pthread_rwlock_init.c (original)
+++ branches/eglibc-2_14/libc/nptl/pthread_rwlock_init.c Tue Jun 21 08:43:34 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2007,2009,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include "pthreadP.h"
+#include <string.h>
 #include <kernel-features.h>
 
 

Modified: branches/eglibc-2_14/libc/resolv/res_send.c
==============================================================================
--- branches/eglibc-2_14/libc/resolv/res_send.c (original)
+++ branches/eglibc-2_14/libc/resolv/res_send.c Tue Jun 21 08:43:34 2011
@@ -549,7 +549,7 @@
 				    ns, ansp, ansp2, nansp2, resplen2);
 			if (n < 0)
 				return (-1);
-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
+			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
 				goto next_ns;
 		} else {
 			/* Use datagrams. */
@@ -559,7 +559,7 @@
 				    ansp2, nansp2, resplen2);
 			if (n < 0)
 				return (-1);
-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
+			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
 				goto next_ns;
 			if (v_circuit)
 			  // XXX Check whether both requests failed or

Modified: branches/eglibc-2_14/libc/sysdeps/posix/getaddrinfo.c
==============================================================================
--- branches/eglibc-2_14/libc/sysdeps/posix/getaddrinfo.c (original)
+++ branches/eglibc-2_14/libc/sysdeps/posix/getaddrinfo.c Tue Jun 21 08:43:34 2011
@@ -821,7 +821,7 @@
 	  size_t tmpbuflen = 1024;
 	  malloc_tmpbuf = !__libc_use_alloca (alloca_used + tmpbuflen);
 	  assert (tmpbuf == NULL);
-	  if (malloc_tmpbuf)
+	  if (!malloc_tmpbuf)
 	    tmpbuf = alloca_account (tmpbuflen, alloca_used);
 	  else
 	    {

Modified: branches/eglibc-2_14/libc/sysdeps/unix/sysv/linux/check_native.c
==============================================================================
--- branches/eglibc-2_14/libc/sysdeps/unix/sysv/linux/check_native.c (original)
+++ branches/eglibc-2_14/libc/sysdeps/unix/sysv/linux/check_native.c Tue Jun 21 08:43:34 2011
@@ -1,5 +1,5 @@
 /* Determine whether interfaces use native transport.  Linux version.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <net/if.h>

Modified: branches/eglibc-2_14/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_14/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_14/ports/ChangeLog.arm Tue Jun 21 08:43:34 2011
@@ -1,3 +1,7 @@
+2010-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New.
+
 2011-05-07  Konstantinos Margaritis  <markos@xxxxxxxxxxxxxx>
 
 	* sysdeps/arm/preconfigure: Detect arm-linux-gnueabi* as ARM EABI.

Modified: branches/eglibc-2_14/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_14/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_14/ports/ChangeLog.mips Tue Jun 21 08:43:34 2011
@@ -1,3 +1,13 @@
+2011-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c,
+	sysdeps/unix/sysv/linux/mips/mips32/internal_sendmmsg.S: New.
+
+2011-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (SI_USER): Don't
+	mention raise in the comment.
+
 2011-05-23  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_RTTIME):

Modified: branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
==============================================================================
--- branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h (original)
+++ branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/siginfo.h Tue Jun 21 08:43:34 2011
@@ -1,5 +1,5 @@
 /* siginfo_t, sigevent and constants.  Linux/MIPS version.
-   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -146,7 +146,7 @@
 # define SI_ASYNCIO	SI_ASYNCIO
   SI_QUEUE,			/* Sent by sigqueue.  */
 # define SI_QUEUE	SI_QUEUE
-  SI_USER,			/* Sent by kill, sigsend, raise.  */
+  SI_USER,			/* Sent by kill, sigsend.  */
 # define SI_USER	SI_USER
   SI_KERNEL = 0x80		/* Send by kernel.  */
 #define SI_KERNEL	SI_KERNEL

Modified: branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
==============================================================================
--- branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h (original)
+++ branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h Tue Jun 21 08:43:34 2011
@@ -415,7 +415,7 @@
 
 __BEGIN_DECLS
 
-/* Receive a message as described by MESSAGE from socket FD.
+/* Receive up to VLEN messages as described by VMESSAGES from socket FD.
    Returns the number of bytes read or -1 for errors.
 
    This function is a cancellation point and therefore not marked with
@@ -424,6 +424,13 @@
 		     unsigned int __vlen, int __flags,
 		     __const struct timespec *__tmo);
 
+/* Send a VLEN messages as described by VMESSAGES to socket FD.
+   Return the number of datagrams successfully written or -1 for errors.
+This function is a cancellation point and therefore not marked with
+   __THROW.  */
+extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
+		     unsigned int __vlen, int __flags);
+
 __END_DECLS
 
 #endif	/* bits/socket.h */