From 2415b86173a44a83d6d3c98699499e4a6afc847f Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Jan 12 2015 14:50:28 +0000
Subject: Pass address of main_arena.mutex to mutex_lock/unlock functions


Fix up a Fedora patch to pass the address of the mutex in the mstate
instead of the mstate itself.  This fizes the Werror warning seen on
all non-x86 builds.

---

diff --git a/glibc-rh757881.patch b/glibc-rh757881.patch
index f633dc5..a630ec9 100644
--- a/glibc-rh757881.patch
+++ b/glibc-rh757881.patch
@@ -17,9 +17,9 @@ diff -pruN a/malloc/hooks.c b/malloc/hooks.c
          (char *) t + chunksize (t) == mp_.sbrk_base + main_arena.system_mem)))
      return 0;
  
-+  mutex_unlock(&main_arena);
++  mutex_unlock(&main_arena.mutex);
    malloc_printerr (check_action, "malloc: top chunk is corrupt", t);
-+  mutex_lock(&main_arena);
++  mutex_lock(&main_arena.mutex);
  
    /* Try to set up a new top chunk. */
    brk = MORECORE (0);
diff --git a/glibc.spec b/glibc.spec
index c3b361a..2c2c915 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.20-480-g46abb64
 %define glibcversion 2.20.90
-%define glibcrelease 17%{?dist}
+%define glibcrelease 18%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -717,9 +717,6 @@ build()
 %ifarch %{lock_elision_arches}
 		--enable-lock-elision \
 %endif
-%ifarch armv7hl ppc64 ppc64p7 ppc64le s390 s390x
-		--disable-werror \
-%endif
 		--disable-profile --enable-nss-crypt ||
 		{ cat config.log; false; }
 
@@ -1745,6 +1742,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Jan 12 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-18
+- Pass address of main_arena.mutex to mutex_lock/unlock.
+
 * Thu Jan 08 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-17
 - Define a __tls_get_addr macro to avoid a conflicting declaration.