[xulrunner] More ppc(64) fixes - mozbz#746112

[Martin Stransky]

commit d88f0a6b832a12803c50e051d50c2b82577300cb
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu May 31 14:23:02 2012 +0200

    More ppc(64) fixes - mozbz#746112

 mozilla-746112-1.patch |   18 ++++++++++++++++++
 xulrunner.spec         |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-746112-1.patch b/mozilla-746112-1.patch
new file mode 100644
index 0000000..928d775
--- /dev/null
+++ b/mozilla-746112-1.patch
@@ -0,0 +1,18 @@
+diff -up mozilla-esr10/js/src/jsgcchunk.cpp.old mozilla-esr10/js/src/jsgcchunk.cpp
+--- mozilla-esr10/js/src/jsgcchunk.cpp.old	2012-03-03 04:28:25.000000000 +0100
++++ mozilla-esr10/js/src/jsgcchunk.cpp	2012-04-18 10:11:55.123376498 +0200
+@@ -366,9 +366,14 @@ CommitMemory(void *addr, size_t size)
+ bool
+ DecommitMemory(void *addr, size_t size)
+ {
++// A workaround for Bug 746112 - endless loop on ppc64
++#if !(defined(__powerpc__))
+     JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
+     int result = madvise(addr, size, MADV_DONTNEED);
+     return result != -1;
++#else
++    return true;
++#endif
+ }
+ #else
+ # error "No CommitMemory defined on this platform."
diff --git a/xulrunner.spec b/xulrunner.spec
index 86b9913..b0d47fa 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -73,7 +73,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        12.0
-Release:        6%{?pre_tag}%{?dist}
+Release:        7%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -108,6 +108,7 @@ Patch47:        mozilla-691898.patch
 Patch48:        mozilla-734335.patch
 %ifarch ppc ppc64
 Patch49:        mozilla-746112.patch
+Patch50:        mozilla-746112-1.patch
 %endif
 
 # ---------------------------------------------------
@@ -252,6 +253,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch48 -p2 -b .734335
 %ifarch ppc ppc64
 %patch49 -p2 -b .746112
+%patch50 -p1 -b .746112-1
 %endif
 
 %{__rm} -f .mozconfig
@@ -510,6 +512,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 28 2012 Martin Stransky <stransky at redhat.com> - 12.0-7
+- More ppc(64) fixes - mozbz#746112
+
 * Mon May 28 2012 Martin Stransky <stransky at redhat.com> - 12.0-6
 - Added workaround for ppc(64) - mozbz#746112