[xulrunner/f15] Added workaround for ppc(64) - mozbz#746112

Martin Stransky stransky at fedoraproject.org
Mon May 28 07:25:09 UTC 2012


commit 9ccd78f5a81ca7c84a8381e99b473a39e0f07914
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon May 28 09:25:02 2012 +0200

    Added workaround for ppc(64) - mozbz#746112

 mozilla-746112.patch |   35 +++++++++++++++++++++++++++++++++++
 xulrunner.spec       |   11 ++++++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-746112.patch b/mozilla-746112.patch
new file mode 100644
index 0000000..765f993
--- /dev/null
+++ b/mozilla-746112.patch
@@ -0,0 +1,35 @@
+Index: xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrInterpreter.h
+===================================================================
+--- xulrunner-10.0.1.orig/mozilla-release/js/src/yarr/YarrInterpreter.h
++++ xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrInterpreter.h
+@@ -167,7 +167,7 @@ struct ByteTerm {
+         inputPosition = inputPos;
+     }
+ 
+-    ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos)
++    ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline))
+         : type(type)
+         , m_capture(capture)
+         , m_invert(false)
+@@ -188,7 +188,7 @@ struct ByteTerm {
+         atom.quantityCount = 1;
+     }
+ 
+-    ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos)
++    ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline))
+         : type(type)
+         , m_capture(capture)
+         , m_invert(invert)
+Index: xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrPattern.h
+===================================================================
+--- xulrunner-10.0.1.orig/mozilla-release/js/src/yarr/YarrPattern.h
++++ xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrPattern.h
+@@ -171,7 +171,7 @@ struct PatternTerm {
+         quantityCount = 1;
+     }
+ 
+-    PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false)
++    PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline))
+         : type(type)
+         , m_capture(capture)
+         , m_invert(invert)
diff --git a/xulrunner.spec b/xulrunner.spec
index 51dd573..86b9913 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -73,7 +73,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        12.0
-Release:        5%{?pre_tag}%{?dist}
+Release:        6%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -106,6 +106,9 @@ Patch43:        mozilla-file.patch
 Patch46:        mozilla-724615.patch
 Patch47:        mozilla-691898.patch
 Patch48:        mozilla-734335.patch
+%ifarch ppc ppc64
+Patch49:        mozilla-746112.patch
+%endif
 
 # ---------------------------------------------------
 
@@ -247,6 +250,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch46 -p1 -b .724615
 %patch47 -p2 -b .691898
 %patch48 -p2 -b .734335
+%ifarch ppc ppc64
+%patch49 -p2 -b .746112
+%endif
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -504,6 +510,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 28 2012 Martin Stransky <stransky at redhat.com> - 12.0-6
+- Added workaround for ppc(64) - mozbz#746112
+
 * Mon May 7 2012 Dan HorĂ¡k <dan[at]danny.cz> - 12.0-5
 - Used backported upstream patch from mozb#734335 for fixing the sps profiler build
 - Fixed build of jemalloc on ppc (patch by Gustavo Luiz Duarte/IBM)


More information about the scm-commits mailing list