[glibc] Sync with upstream master

[Siddhesh Poyarekar]

commit b5ec0026f9c43aa8377a84641f05a6cabfae250d
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Apr 3 17:08:52 2014 +0530

    Sync with upstream master

 glibc-fedora-elf-ORIGIN.patch |    4 ++--
 glibc.spec                    |    7 +++++--
 sources                       |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/glibc-fedora-elf-ORIGIN.patch b/glibc-fedora-elf-ORIGIN.patch
index ef08187..0010733 100644
--- a/glibc-fedora-elf-ORIGIN.patch
+++ b/glibc-fedora-elf-ORIGIN.patch
@@ -31,7 +31,7 @@ index 18a83d2..6e16a9a 100644
  	   && (!is_path || name[len] != ':'))
      return 0;
  
--  if (__builtin_expect (secure, 0)
+-  if (__glibc_unlikely (secure)
 -      && ((name[len] != '\0' && name[len] != '/'
 -	   && (!is_path || name[len] != ':'))
 -	  || (name != start + 1 && (!is_path || name[-2] != ':'))))
@@ -68,7 +68,7 @@ index 18a83d2..6e16a9a 100644
 -	      repl = l->l_origin;
 +	      /* For SUID/GUID programs $ORIGIN must always appear
 +		 first in a path element.  */
-+	      if (__builtin_expect (INTUSE(__libc_enable_secure), 0)
++	      if (__glibc_unlikely (INTUSE(__libc_enable_secure))
 +		  && ((name[len] != '\0' && name[len] != '/'
 +		       && (!is_path || name[len] != ':'))
 +		      || (name != start + 1 && (!is_path || name[-2] != ':'))))
diff --git a/glibc.spec b/glibc.spec
index 86668e0..c1b572f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-226-ga5e5f1e
+%define glibcsrcdir  glibc-2.19-257-gf6488e2b
 %define glibcversion 2.19.90
-%define glibcrelease 8%{?dist}
+%define glibcrelease 9%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1639,6 +1639,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Apr 03 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-9
+- Sync with upstream master.
+
 * Wed Mar 26 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-8
 - Sync with upstream master.
 
diff --git a/sources b/sources
index 32c7914..9fd0389 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c880117a310f909320f13727f9ed8383  glibc-2.19-226-ga5e5f1e.tar.gz
+c7cf63e359a82e4e883f0a99acf4d20c  glibc-2.19-257-gf6488e2b.tar.gz