[glibc] Sync with roland/nptl upstream branch

[Siddhesh Poyarekar]

commit 1ea305b6fad82f7c11c9c5817deb3a015d55a802
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Jul 3 11:04:10 2014 +0530

    Sync with roland/nptl upstream branch
    
    Patches on this branch include nptl as a part of glibc instead of
    being an addon.

 glibc-fedora-uname-getrlimit.patch |    6 +++---
 glibc-rh1013801.patch              |   20 ++++++++++----------
 glibc.spec                         |    7 +++++--
 sources                            |    2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/glibc-fedora-uname-getrlimit.patch b/glibc-fedora-uname-getrlimit.patch
index def60e9..dccace7 100644
--- a/glibc-fedora-uname-getrlimit.patch
+++ b/glibc-fedora-uname-getrlimit.patch
@@ -21,9 +21,9 @@ GLIBC_PRIVATE.
 --- a/nptl/Version
 +++ b/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
-     # Internal libc interface to libpthread
-     __libc_dl_error_tsd;
-     __libc_vfork;
+     __libc_pthread_init;
+     __libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
+     __libc_allocate_rtsig_private;
 +    __getrlimit;
    }
  }
diff --git a/glibc-rh1013801.patch b/glibc-rh1013801.patch
index 532589c..ac656b5 100644
--- a/glibc-rh1013801.patch
+++ b/glibc-rh1013801.patch
@@ -15,24 +15,24 @@
 #
 diff --git a/nptl/sysdeps/unix/sysv/linux/Makefile b/nptl/sysdeps/unix/sysv/linux/Makefile
 index 6078e2d..36fd50b 100644
---- a/nptl/sysdeps/unix/sysv/linux/Makefile
-+++ b/nptl/sysdeps/unix/sysv/linux/Makefile
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -18,7 +18,9 @@
  
- ifeq ($(subdir),nptl)
- sysdep_routines += register-atfork unregister-atfork libc_pthread_init \
--		   libc_multiple_threads
-+		   libc_multiple_threads libc_pthread_atfork
+ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
+ 	   libc-cleanup libc_pthread_init libc_multiple_threads \
+-	   register-atfork unregister-atfork
++	   register-atfork unregister-atfork libc_pthread_atfork
 +
 +static-only-routines += libc_pthread_atfork
+ shared-only-routines = forward
  
- libpthread-sysdep_routines += pt-fork pthread_mutex_cond_lock
- 
-diff --git a/nptl/sysdeps/unix/sysv/linux/libc_pthread_atfork.c b/nptl/sysdeps/unix/sysv/linux/libc_pthread_atfork.c
+ libpthread-routines = nptl-init vars events version \
+diff --git a/nptl/libc_pthread_atfork.c b/nptl/libc_pthread_atfork.c
 new file mode 100644
 index 0000000..667049a
 --- /dev/null
-+++ b/nptl/sysdeps/unix/sysv/linux/libc_pthread_atfork.c
++++ b/nptl/libc_pthread_atfork.c
 @@ -0,0 +1,54 @@
 +/* Copyright (C) 2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
diff --git a/glibc.spec b/glibc.spec
index 85ad4ac..0e9d598 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-743-g256aa66
+%define glibcsrcdir  glibc-2.19-739-gd6505ce
 %define glibcversion 2.19.90
-%define glibcrelease 24%{?dist}
+%define glibcrelease 25%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1641,6 +1641,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jul 03 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-25
+- Sync with upstream roland/nptl branch.
+
 * Wed Jul 02 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-24
 - Sync with upstream master.
 
diff --git a/sources b/sources
index fd3c568..41bbe35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9dd9777f458e830e01823eeb3ba7ea4  glibc-2.19-743-g256aa66.tar.gz
+9f1b4969786209cf1415ce8e953215e3  glibc-2.19-739-gd6505ce.tar.gz