[thunderbird-lightning] sync secondary arches support with xulrunner/thunderbird

[Dan Horák]

commit 76cf2b9e63632d1572219f3415952b6ac0303145
Author: Dan Horák <dan at danny.cz>
Date:   Wed Oct 12 10:56:25 2011 +0200

    sync secondary arches support with xulrunner/thunderbird

 mozilla-670719.patch           |   53 ++++++++++++++++++++++++++++++++++++++++
 thunderbird-lightning.spec     |   12 +++++++-
 xulrunner-7.0.1-yarr-jit.patch |   44 +++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 2 deletions(-)
---
diff --git a/mozilla-670719.patch b/mozilla-670719.patch
new file mode 100644
index 0000000..afae907
--- /dev/null
+++ b/mozilla-670719.patch
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla at glandium.org>
+# Date 1313846520 -7200
+# Node ID fdc3b63938f5a76d99c1e2bb12fd448465debc94
+# Parent  07a5a618ebe3f67b23100ceb1b51e92bb79be0cd
+Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of trace/method/yarr jit is enabled.
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -433,16 +433,19 @@ CPPSRCS += \
+ 		YarrPattern.cpp \
+ 		YarrSyntaxChecker.cpp \
+ 		$(NULL)
+ else
+ 
+ ###############################################
+ # BEGIN include sources for the Nitro assembler
+ #
++
++ENABLE_YARR_JIT = 1
++
+ VPATH += 	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/assembler/jit \
+ 		$(srcdir)/assembler/assembler \
+ 		$(srcdir)/methodjit \
+ 		$(srcdir)/yarr \
+ 		$(NONE)
+ 
+@@ -1070,17 +1073,21 @@ endif
+ 
+ ###############################################
+ # BEGIN kludges for the Nitro assembler
+ #
+ 
+ # Needed to "configure" it correctly.  Unfortunately these
+ # flags wind up being applied to all code in js/src, not just
+ # the code in js/src/assembler.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
++
++ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
++CXXFLAGS +=  -DENABLE_JIT=1
++endif
+ 
+ INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
+ 
+ ifdef ENABLE_METHODJIT
+ # Build a standalone test program that exercises the assembler
+ # sources a bit.
+ TESTMAIN_OBJS = \
+ 		Assertions.$(OBJ_SUFFIX) \
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 5451a4b..86e3a6c 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -28,7 +28,7 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        1.0
-Release:        0.50.b7%{?dist}
+Release:        0.51.b7%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -45,8 +45,11 @@ Source100:      find-external-requires
 
 # Mozilla (XULRunner) patches
 Patch0:         thunderbird-version.patch
-# Fix build on secondary arches (patch copied from xulrunner)
+# Fix build on secondary arches (patches copied from xulrunner)
 Patch2:         xulrunner-6.0-secondary-ipc.patch
+Patch3:         mozilla-670719.patch
+Patch4:         xulrunner-7.0.1-yarr-jit.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
@@ -107,6 +110,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 
 cd mozilla
 %patch2 -p2 -b .secondary-ipc
+%patch3 -p1 -b .moz670719
+%patch4 -p2 -b .yarr-jit
 cd ..
 
 %{__rm} -f .mozconfig
@@ -192,6 +197,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> - 1.0-0.51.b7
+- sync secondary arches support with xulrunner/thunderbird
+
 * Wed Sep 28 2011 Orion Poplawski <orion at cora.nwra.com> - 1.0-0.50.b7
 - Use lightning 1.0b7 source for TB 7
 - Update l10n source
diff --git a/xulrunner-7.0.1-yarr-jit.patch b/xulrunner-7.0.1-yarr-jit.patch
new file mode 100644
index 0000000..da64d0f
--- /dev/null
+++ b/xulrunner-7.0.1-yarr-jit.patch
@@ -0,0 +1,44 @@
+diff -up xulrunner-7.0.1/mozilla-release/js/src/jsregexpinlines.h.yarr-jit xulrunner-7.0.1/mozilla-release/js/src/jsregexpinlines.h
+--- xulrunner-7.0.1/mozilla-release/js/src/jsregexpinlines.h.yarr-jit	2011-09-28 22:24:50.000000000 +0200
++++ xulrunner-7.0.1/mozilla-release/js/src/jsregexpinlines.h	2011-10-11 17:35:10.000000000 +0200
+@@ -491,7 +491,9 @@ RegExp::compileHelper(JSContext *cx, JSL
+     }
+ #endif
+ 
++#if ENABLE_YARR_JIT
+     codeBlock.setFallBack(true);
++#endif
+     byteCode = JSC::Yarr::byteCompile(yarrPattern, cx->compartment->regExpAllocator).get();
+ 
+     return true;
+diff -up xulrunner-7.0.1/mozilla-release/js/src/yarr/wtfbridge.h.yarr-jit xulrunner-7.0.1/mozilla-release/js/src/yarr/wtfbridge.h
+--- xulrunner-7.0.1/mozilla-release/js/src/yarr/wtfbridge.h.yarr-jit	2011-09-28 22:24:52.000000000 +0200
++++ xulrunner-7.0.1/mozilla-release/js/src/yarr/wtfbridge.h	2011-10-11 17:35:10.000000000 +0200
+@@ -50,7 +50,9 @@
+ #include "jstl.h"
+ #include "vm/String.h"
+ #include "assembler/wtf/Platform.h"
++#if ENABLE_YARR_JIT
+ #include "assembler/jit/ExecutableAllocator.h"
++#endif
+ 
+ namespace JSC { namespace Yarr {
+ 
+@@ -261,6 +263,8 @@ deleteAllValues(Vector<T, N> &v) {
+     v.deleteAllValues();
+ }
+ 
++#if ENABLE_YARR_JIT
++
+ /*
+  * Minimal JSGlobalData. This used by Yarr to get the allocator.
+  */
+@@ -272,6 +276,8 @@ class JSGlobalData {
+      : regexAllocator(regexAllocator) { }
+ };
+ 
++#endif
++
+ /*
+  * Sentinel value used in Yarr.
+  */