rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Pass address of main_arena.mutex to mutex_lock/unlock functions

Browse Source 
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.
This commit is contained in:
Siddhesh Poyarekar 2015-01-12 20:20:28 +05:30
parent 84d34071af
commit 2415b86173
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glibc-rh757881.patch
View File

@ -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))) (char *) t + chunksize (t) == mp_.sbrk_base + main_arena.system_mem)))
return 0; return 0;
+ mutex_unlock(&main_arena); + mutex_unlock(&main_arena.mutex);
malloc_printerr (check_action, "malloc: top chunk is corrupt", t); 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. */ /* Try to set up a new top chunk. */
brk = MORECORE (0); brk = MORECORE (0);

8
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.20-480-g46abb64 %define glibcsrcdir glibc-2.20-480-g46abb64
%define glibcversion 2.20.90 %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 # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -716,9 +716,6 @@ build()
%endif %endif
%ifarch %{lock_elision_arches} %ifarch %{lock_elision_arches}
--enable-lock-elision \ --enable-lock-elision \
%endif
%ifarch armv7hl ppc64 ppc64p7 ppc64le s390 s390x
--disable-werror \
%endif %endif
--disable-profile --enable-nss-crypt || --disable-profile --enable-nss-crypt ||
{ cat config.log; false; } { cat config.log; false; }
@ -1745,6 +1742,9 @@ rm -f *.filelist*
%endif %endif
%changelog %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 * Thu Jan 08 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-17
- Define a __tls_get_addr macro to avoid a conflicting declaration. - Define a __tls_get_addr macro to avoid a conflicting declaration.