Sync with upstream master

glibc-fedora-streams-rh436349.patch

@@ -4,8 +4,8 @@ This is part of commit glibc-2.3.3-1564-gd0b6ac6
 - remove <stropts.h>, define _XOPEN_STREAMS -1 (#436349)
 
 diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
---- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-05 07:42:49.000000000 -0600
-+++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-07 12:15:21.817318674 -0600
+--- a/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-05 07:42:49.000000000 -0600
++++ b/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-07 12:15:21.817318674 -0600
 @@ -188,4 +188,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1

glibc-scalbn-i386-abi.patch

@@ -0,0 +1,48 @@
+commit 1fe3da33623aaf78b7cac5858f4a7a64aeeba303
+Author: Siddhesh Poyarekar <siddhesh@redhat.com>
+Date:   Tue Jun 24 13:19:06 2014 +0530
+
+    Add compat symbols for scalb* in i386
+    
+    Bring back symbols into libc.so for scalb* functions.  They are no
+    longer used but unfortunately they're now part of the ABI.
+
+diff --git a/sysdeps/i386/fpu/s_scalbn.S b/sysdeps/i386/fpu/s_scalbn.S
+index 548f19f..21cb98b 100644
+--- a/sysdeps/i386/fpu/s_scalbn.S
++++ b/sysdeps/i386/fpu/s_scalbn.S
+@@ -16,3 +16,8 @@ ENTRY(__scalbn)
+ END (__scalbn)
+ weak_alias (__scalbn, scalbn)
+ strong_alias (__scalbn, __scalbln)
++
++#include <shlib-compat.h>
++#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
++compat_symbol (libc, __scalbn, scalbln, GLIBC_2_1);
++#endif
+diff --git a/sysdeps/i386/fpu/s_scalbnf.S b/sysdeps/i386/fpu/s_scalbnf.S
+index fe6516e..fe504c0 100644
+--- a/sysdeps/i386/fpu/s_scalbnf.S
++++ b/sysdeps/i386/fpu/s_scalbnf.S
+@@ -16,3 +16,8 @@ ENTRY(__scalbnf)
+ END (__scalbnf)
+ weak_alias (__scalbnf, scalbnf)
+ strong_alias (__scalbnf, __scalblnf)
++
++#include <shlib-compat.h>
++#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
++compat_symbol (libc, __scalbnf, scalblnf, GLIBC_2_1);
++#endif
+diff --git a/sysdeps/i386/fpu/s_scalbnl.S b/sysdeps/i386/fpu/s_scalbnl.S
+index 8f65de4..f1ca7ad 100644
+--- a/sysdeps/i386/fpu/s_scalbnl.S
++++ b/sysdeps/i386/fpu/s_scalbnl.S
+@@ -17,3 +17,8 @@ ENTRY(__scalbnl)
+ END (__scalbnl)
+ weak_alias (__scalbnl, scalbnl)
+ strong_alias (__scalbnl, __scalblnl)
++
++#include <shlib-compat.h>
++#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20)
++compat_symbol (libc, __scalbnl, scalblnl, GLIBC_2_1);
++#endif

glibc.spec

@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-591-ga729111
+%define glibcsrcdir  glibc-2.19-654-g4841e6a
 %define glibcversion 2.19.90
-%define glibcrelease 22%{?dist}
+%define glibcrelease 23%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -221,6 +221,7 @@ Patch2031: %{name}-rh1070416.patch
 
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
+Patch2035: %{name}-scalbn-i386-abi.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -552,6 +553,7 @@ package or when debugging this package.
 %patch0047 -p1
 %patch2033 -p1
 %patch2034 -p1
+%patch2035 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1641,6 +1643,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Jun 24 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-23
+- Sync with upstream master.
+- Add fix to unbreak i386 ABI breakage due to a change in scalbn.
+
 * Fri Jun 20 2014 Kyle McMartin <kmcmarti@redhat.com> - 2.19.90-22
 - AArch64: Save & restore NZCV (flags) upon entry to _dl_tlsdesc_dynamic
   in order to work around GCC reordering compares across the TLS

sources

@@ -1 +1 @@
-4a3aab3d214d943efc7531287655daf6  glibc-2.19-591-ga729111.tar.gz
+6b86b07d7a0880f9181e96e58a1d525b  glibc-2.19-654-g4841e6a.tar.gz