[glibc] Sync with upstream master

[Siddhesh Poyarekar]

commit 25cc20651e5b52b0b25850af891d1bedfad49134
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu May 15 12:26:54 2014 +0530

    Sync with upstream master
    
    Fix up glibc-fedora-uname-getrlimit.patch to apply on top of recent
    nptl code shuffle.

 glibc-fedora-uname-getrlimit.patch |   28 ++++++++++++++--------------
 glibc.spec                         |    7 +++++--
 sources                            |    2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/glibc-fedora-uname-getrlimit.patch b/glibc-fedora-uname-getrlimit.patch
index 86383d4..def60e9 100644
--- a/glibc-fedora-uname-getrlimit.patch
+++ b/glibc-fedora-uname-getrlimit.patch
@@ -13,17 +13,17 @@ GLIBC_PRIVATE.
  ChangeLog                                  |    8 ++++++++
  nptl/Versions                              |    1 +
  nptl/nptl-init.c                           |    2 +-
- nptl/sysdeps/unix/sysv/linux/i386/Versions |    6 ++++++
- nptl/sysdeps/unix/sysv/linux/i386/smp.h    |    2 +-
+ sysdeps/unix/sysv/linux/i386/Versions |    6 ++++++
+ sysdeps/unix/sysv/linux/i386/smp.h    |    2 +-
  5 files changed, 17 insertions(+), 2 deletions(-)
- create mode 100644 nptl/sysdeps/unix/sysv/linux/i386/Versions
+ create mode 100644 sysdeps/unix/sysv/linux/i386/Versions
 
 --- a/nptl/Version
 +++ b/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
-     __libc_alloca_cutoff;
      # Internal libc interface to libpthread
      __libc_dl_error_tsd;
+     __libc_vfork;
 +    __getrlimit;
    }
  }
@@ -39,17 +39,17 @@ GLIBC_PRIVATE.
        || limit.rlim_cur == RLIM_INFINITY)
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
---- a/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions
-@@ -0,0 +1,6 @@
-+libc {
-+  GLIBC_PRIVATE {
-+    # Internal libc interface to libpthread
+--- a/sysdeps/unix/sysv/linux/i386/Versions
++++ b/sysdeps/unix/sysv/linux/i386/Versions
+@@ -53,5 +53,6 @@
+   }
+   GLIBC_PRIVATE {
+     __modify_ldt;
 +    __uname;
-+  }
-+}
---- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+   }
+ }
+--- a/sysdeps/unix/sysv/linux/i386/smp.h
++++ b/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -36,7 +36,7 @@ is_smp_system (void)
    char *cp;
  
diff --git a/glibc.spec b/glibc.spec
index eea9e76..39b4982 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-323-g5abebba
+%define glibcsrcdir  glibc-2.19-418-ga5d87b3
 %define glibcversion 2.19.90
-%define glibcrelease 14%{?dist}
+%define glibcrelease 15%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1642,6 +1642,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu May 15 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-15
+- Sync with upstream master.
+
 * Wed May 14 2014 Carlos O'Donell <carlos at redhat.com> - 2.19.90-14
 - Add support for displaying all test results in build logs.
 
diff --git a/sources b/sources
index ba0b85d..d187d34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-411c3154a69ae3d4ca7f1a4f2866ef62  glibc-2.19-323-g5abebba.tar.gz
+597f972539723b3d709781c408400558  glibc-2.19-418-ga5d87b3.tar.gz