[commits] r10908 - in /fsf/trunk/libc: ./ elf/ nptl/ nptl/sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jul  7 00:03:35 2010
New Revision: 10908

Log:
Import glibc-mainline for 2010-07-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/dl-version.c
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/fpathconf.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul  7 00:03:35 2010
@@ -1,3 +1,13 @@
+2010-07-06  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* elf/dl-version.c (match_symbol): Don't pass NULL occation to
+	dl_signal_cerror.
+
+2010-07-06  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Implement
+	_PC_PIPE_BUF using F_GETPIPE_SZ.
+
 2010-07-05  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* manual/arith.texi (Rounding Functions): Fix rint description

Modified: fsf/trunk/libc/elf/dl-version.c
==============================================================================
--- fsf/trunk/libc/elf/dl-version.c (original)
+++ fsf/trunk/libc/elf/dl-version.c Wed Jul  7 00:03:35 2010
@@ -169,7 +169,7 @@
   result = 1;
  call_cerror:
   _dl_signal_cerror (0, map->l_name[0] ? map->l_name : rtld_progname,
-		     NULL, errstring);
+		     N_("version lookup error"), errstring);
   return result;
 }
 

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Jul  7 00:03:35 2010
@@ -1,3 +1,8 @@
+2010-07-06  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np):
+	Fix type mismatch.
+
 2010-07-03  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* tst-abstime.c (do_test): Some more cleanups

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c Wed Jul  7 00:03:35 2010
@@ -42,7 +42,7 @@
   if (len < TASK_COMM_LEN)
     return ERANGE;
 
-  if (th == THREAD_SELF)
+  if (pd == THREAD_SELF)
     return prctl (PR_GET_NAME, buf) ? errno : 0;
 
 #define FMT "/proc/self/task/%u/comm"

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/fpathconf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/fpathconf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/fpathconf.c Wed Jul  7 00:03:35 2010
@@ -1,5 +1,6 @@
 /* Get file-specific information about descriptor FD.  Linux version.
-   Copyright (C) 1991,1995,1996,1998-2003,2008 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995,1996,1998-2003,2008,2010
+   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
@@ -17,6 +18,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <fcntl.h>
 #include "pathconf.h"
 
 static long int posix_fpathconf (int fd, int name);
@@ -33,6 +35,7 @@
      int name;
 {
   struct statfs fsbuf;
+  int r;
 
   switch (name)
     {
@@ -48,6 +51,12 @@
     case _PC_CHOWN_RESTRICTED:
       return __statfs_chown_restricted (__fstatfs (fd, &fsbuf), &fsbuf);
 
+    case _PC_PIPE_BUF:
+      r = fcntl (fd, F_GETPIPE_SZ);
+      if (r > 0)
+	return r;
+      /* FALLTHROUGH */
+
     default:
       return posix_fpathconf (fd, name);
     }