[seamonkey/el6] add nodecommit patch to complete bug #852698 workaround

Dmitry Butskoy buc at fedoraproject.org
Fri Oct 12 13:51:32 UTC 2012


commit 71394d9944a433f1d32a3a0c0389134916bc335e
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Fri Oct 12 17:51:00 2012 +0400

    add nodecommit patch to complete bug #852698 workaround

 seamonkey-2.12.1-nodecommit.patch |   19 +++++++++++++++++++
 seamonkey.spec                    |   11 +++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/seamonkey-2.12.1-nodecommit.patch b/seamonkey-2.12.1-nodecommit.patch
new file mode 100644
index 0000000..c6282b0
--- /dev/null
+++ b/seamonkey-2.12.1-nodecommit.patch
@@ -0,0 +1,19 @@
+Index: comm-release/mozilla/js/src/gc/Memory.cpp
+===================================================================
+--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
++++ comm-release/mozilla/js/src/gc/Memory.cpp
+@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
+ bool
+ MarkPagesUnused(void *p, size_t size)
+ {
++// A workaround for Bug 746112 - endless loop on ppc64
++#if !(defined(__powerpc__))
+     JS_ASSERT(uintptr_t(p) % PageSize == 0);
+     int result = madvise(p, size, MADV_DONTNEED);
+     return result != -1;
++#else
++    return true;
++#endif
+ }
+ 
+ bool
diff --git a/seamonkey.spec b/seamonkey.spec
index d0c813f..d5360dc 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -43,8 +43,9 @@ Patch1:         xulrunner-15.0-gcc47.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
 Patch20:	seamonkey-2.13-jemalloc.patch
-Patch21:	seamonkey-2.13-installdir.patch
-Patch22:	seamonkey-2.13-nspr_4_9_1.patch
+Patch21:	seamonkey-2.12.1-nodecommit.patch
+Patch22:	seamonkey-2.13-installdir.patch
+Patch23:	seamonkey-2.13-nspr_4_9_1.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -122,10 +123,11 @@ popd
 %patch5 -p2 -b .addons
 %patch10 -p2 -b .idl-parser-cachepath
 %patch20 -p1 -b .jemalloc
+%patch21 -p1 -b .nodecommit
 
-%patch21 -p2 -b .installdir
+%patch22 -p2 -b .installdir
 
-%patch22 -p2 -b .nspr491
+%patch23 -p2 -b .nspr491
 
 
 # fix obsoleted modifier in inspector
@@ -462,6 +464,7 @@ fi
 %changelog
 * Thu Oct 11 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.13-1
 - update to 2.13
+- add patch to avoid decommit memory on powerpc arches (#852698)
 - add seamonkey-related directories in mozilla-filesystem (#865054)
 - fix build with RHEL6 system nspr-4.9.1 (drop setting nspr thread names,
   as it requires nspr >= 4.9.2, but just can be safely removed from the code)


More information about the scm-commits mailing list