Merge remote branch 'origin/master' into fedora/master

diff --cc ChangeLog
Simple merge

diff --cc localedata/SUPPORTED
Simple merge

diff --cc nptl/ChangeLog
Simple merge

diff --cc sysdeps/unix/sysv/linux/futimesat.c
index 5f3a3f52f316b2e6ae9b5aaf51fca0ce34911473,bb83e74faf2fc72f61df2df6b0d84b9b5c7724ba..8292533afb270a5eff22270e1ccc671146fa072e
--- 1/sysdeps/unix/sysv/linux/futimesat.c
--- 2/sysdeps/unix/sysv/linux/futimesat.c
+++ b/sysdeps/unix/sysv/linux/futimesat.c
@@@ -58,9 -58,30 +58,15 @@@ futimesat (fd, file, tvp
  #ifndef __ASSUME_ATFCTS
    char *buf = NULL;
  
 -  if (file == NULL)
 -    {
 -      static const char procfd[] = "/proc/self/fd/%d";
 -      /* Buffer for the path name we are going to use.  It consists of
 -       - the string /proc/self/fd/
 -       - the file descriptor number.
 -       The final NUL is included in the sizeof.   A bit of overhead
 -       due to the format elements compensates for possible negative
 -       numbers.  */
 -      size_t buflen = sizeof (procfd) + sizeof (int) * 3;
 -      buf = alloca (buflen);
 -
 -      __snprintf (buf, buflen, procfd, fd);
 -      file = buf;
 -    }
 -  else if (fd != AT_FDCWD && file[0] != '/')
 +  if (fd != AT_FDCWD && file[0] != '/')
      {
        size_t filelen = strlen (file);
+       if (__builtin_expect (filelen == 0, 0))
+       {
+         __set_errno (ENOENT);
+         return -1;
+       }
+ 
        static const char procfd[] = "/proc/self/fd/%d/%s";
        /* Buffer for the path name we are going to use.  It consists of
         - the string /proc/self/fd/

diff --cc sysdeps/unix/sysv/linux/i386/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/s390/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/sh/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
Simple merge