From 5d3d5d454257b88a1edbe31efe45ffbed0ca4ab6 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Jan 21 2015 14:48:21 +0000
Subject: Sync with upstream master and disable Werror on s390x


---

diff --git a/glibc-s390-tls-get-addr.patch b/glibc-s390-tls-get-addr.patch
deleted file mode 100644
index ea6a157..0000000
--- a/glibc-s390-tls-get-addr.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h
-index 0fa8045..8132b10 100644
---- a/sysdeps/s390/dl-tls.h
-+++ b/sysdeps/s390/dl-tls.h
-@@ -33,6 +33,13 @@ extern unsigned long __tls_get_offset (unsigned long got_offset);
- 
- #  include <shlib-compat.h>
- 
-+/* dl-tls.c declares __tls_get_addr as an exported symbol if it is not defined
-+   as a macro.  It seems suitable to do that in the generic code because all
-+   architectures other than s390 export __tls_get_addr.  The declaration causes
-+   problems in s390 though, so we define __tls_get_addr here to avoid declaring
-+   __tls_get_addr again.  */
-+#  define __tls_get_addr __tls_get_addr
-+
- extern void *__tls_get_addr (tls_index *ti) attribute_hidden;
- /* Make a temporary alias of __tls_get_addr to remove the hidden
-    attribute.  Then export __tls_get_addr as __tls_get_addr_internal
diff --git a/glibc.spec b/glibc.spec
index da717c6..51a8ef3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.20-480-g46abb64
+%define glibcsrcdir  glibc-2.20-549-g86bba16
 %define glibcversion 2.20.90
-%define glibcrelease 19%{?dist}
+%define glibcrelease 20%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -18,6 +18,10 @@
 %ifarch %{ix86} x86_64 ppc ppc64le s390x armv7hl aarch64
 %define run_valgrind_tests 1
 %endif
+# Disable -Werror in builds for these architectures
+%ifarch s390x
+%define disable_werror 1
+%endif
 ##############################################################################
 # Auxiliary arches are those arches that can be built in addition
 # to the core supported arches. You either install an auxarch or
@@ -236,8 +240,6 @@ Patch2031: %{name}-rh1070416.patch
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
 
-Patch2035: glibc-s390-tls-get-addr.patch
-
 ##############################################################################
 # End of glibc patches.
 ##############################################################################
@@ -570,7 +572,6 @@ package or when debugging this package.
 %patch0050 -p1
 %patch0052 -p1
 %patch0053 -p1
-%patch2035 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -717,6 +718,9 @@ build()
 %ifarch %{lock_elision_arches}
 		--enable-lock-elision \
 %endif
+%if 0%{?disable_werror}
+               --disable-werror \
+%endif
 		--disable-profile --enable-nss-crypt ||
 		{ cat config.log; false; }
 
@@ -1740,6 +1744,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Jan 21 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-20
+- Sync with upstream master.
+- Disable werror on s390x.
+
 * Tue Jan 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.20.90-19
 - Drop large ancient ChangeLogs (rhbz #1169546)
 
diff --git a/sources b/sources
index 0c841d1..50f3d2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca27ede0a7704d4417885f96470a9279  glibc-2.20-480-g46abb64.tar.gz
+d20bdbec8a3e6d22d7070abdf998db9c  glibc-2.20-549-g86bba16.tar.gz