[commits] r14272 - in /fsf/glibc-2_14-branch/libc: ./ nptl/ resolv/ sysdeps/posix/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/wo...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jun 21 07:44:54 2011
New Revision: 14272

Log:
Import glibc-2.14 for 2011-06-21

Added:
    fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
Modified:
    fsf/glibc-2_14-branch/libc/ChangeLog
    fsf/glibc-2_14-branch/libc/nptl/ChangeLog
    fsf/glibc-2_14-branch/libc/nptl/pthread_rwlock_init.c
    fsf/glibc-2_14-branch/libc/resolv/res_send.c
    fsf/glibc-2_14-branch/libc/sysdeps/posix/getaddrinfo.c
    fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/check_native.c

Modified: fsf/glibc-2_14-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_14-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_14-branch/libc/ChangeLog Tue Jun 21 07:44:54 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: fsf/glibc-2_14-branch/libc/nptl/ChangeLog
==============================================================================
--- fsf/glibc-2_14-branch/libc/nptl/ChangeLog (original)
+++ fsf/glibc-2_14-branch/libc/nptl/ChangeLog Tue Jun 21 07:44:54 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: fsf/glibc-2_14-branch/libc/nptl/pthread_rwlock_init.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/nptl/pthread_rwlock_init.c (original)
+++ fsf/glibc-2_14-branch/libc/nptl/pthread_rwlock_init.c Tue Jun 21 07:44:54 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: fsf/glibc-2_14-branch/libc/resolv/res_send.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/resolv/res_send.c (original)
+++ fsf/glibc-2_14-branch/libc/resolv/res_send.c Tue Jun 21 07:44:54 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: fsf/glibc-2_14-branch/libc/sysdeps/posix/getaddrinfo.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/sysdeps/posix/getaddrinfo.c (original)
+++ fsf/glibc-2_14-branch/libc/sysdeps/posix/getaddrinfo.c Tue Jun 21 07:44:54 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: fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/check_native.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/check_native.c (original)
+++ fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/check_native.c Tue Jun 21 07:44:54 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>

Added: fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c (added)
+++ fsf/glibc-2_14-branch/libc/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c Tue Jun 21 07:44:54 2011
@@ -1,0 +1,6 @@
+/* In this implementation we do not really care whether the call fails
+   because of missing kernel support since we do not even call the
+   function in this case.  */
+#undef __ASSUME_ATFCTS
+#define __ASSUME_ATFCTS 1
+#include "fxstatat.c"