Date: Tue, 27 Sep 2011 21:59:53 +0000 From: h h <aakuusta@gmail.com> To: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r628 - branches/experimental/Mk branches/experimental/www/firefox branches/experimental/www/firefox-i18n branches/experimental/www/firefox/files branches/experimental/www/linux-firefox trunk/Mk trunk/www/firefox trunk/www/firefox-i18n trunk/www/firefox/files trunk/www/linux-firefox Message-ID: <86k48tbq92.fsf@gmail.com> In-Reply-To: <201109271557.p8RFvhkB091814@trillian.chruetertee.ch> (svn-freebsd-gecko@chruetertee.ch's message of "Tue, 27 Sep 2011 15:57:43 GMT") References: <201109271557.p8RFvhkB091814@trillian.chruetertee.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
svn-freebsd-gecko@chruetertee.ch writes:
> Author: beat
> Date: Tue Sep 27 15:57:43 2011
> New Revision: 628
>
> Log:
> - Update Firefox to 7.0
[...]
> Added: branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 27 15:57:43 2011 (r628)
> @@ -0,0 +1,13 @@
> +--- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
> ++++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
> +@@ -89,6 +89,10 @@
> + nsresult
> + nsThreadManager::Init()
> + {
> ++#ifdef NS_TLS
> ++ if (!gTLSThreadID)
> ++ gTLSThreadID = mozilla::threads::Generic;
> ++#endif
> + if (!mThreadsByPRThread.Init())
> + return NS_ERROR_OUT_OF_MEMORY;
> +
>
So, are you going to keep workaround unconditionally?
[-- Attachment #2 --]
X-From-Line: nobody Thu Sep 22 17:59:36 2011
From: h h <aakuusta@gmail.com>
To: Florian Smeets <flo@freebsd.org>
Subject: Re: [SVN-Commit] r607 - branches/experimental/www/firefox-aurora
References: <201108032303.p73N3RQq064006@trillian.chruetertee.ch>
<86liv2a8ll.fsf@gmail.com> <4E4184BA.9060701@FreeBSD.org>
<8662m68j21.fsf@gmail.com> <4E419ED6.30709@FreeBSD.org>
<86fwku7b6o.fsf@gmail.com> <4E52305E.3040108@freebsd.org>
<86pqjw1bl0.fsf@gmail.com> <86y5yi1iq7.fsf@gmail.com>
<4E562EAF.6090101@freebsd.org> <8639fzgnwy.fsf@gmail.com>
<4E70D035.1030904@freebsd.org>
X-Draft-From: ("nnmbox:mail.misc" 1614)
Date: Thu, 22 Sep 2011 17:59:36 +0400
In-Reply-To: <4E70D035.1030904@freebsd.org> (Florian Smeets's message of "Wed,
14 Sep 2011 18:03:01 +0200")
Message-ID: <867h50ad9z.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain
Florian Smeets <flo@freebsd.org> writes:
> On 14.09.2011 17:10, h h wrote:
>> http://bugs.freebsd.org/160721
>>
>> Would be good if the fix makes it into 9.0-RELEASE. It'd reduce the
>> number of FreeBSD releases gecko@ has to provide the workaround for.
>>
>
> I just confirmed that it's working, nice! I'll see if i can get
> someone to commit it.
>
> Thanks for notifying me!
So, it was committed only to /head and /stable/8. Can you try the
following diff? It should use the workaround until OSVERSION is bumped
in those branches.
Index: www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp
===================================================================
--- www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp (revision 627)
+++ www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp (working copy)
@@ -1,10 +1,11 @@
--- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,10 @@
+@@ -89,6 +89,11 @@
nsresult
nsThreadManager::Init()
{
-+#ifdef NS_TLS
++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
++ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
+ if (!gTLSThreadID)
+ gTLSThreadID = mozilla::threads::Generic;
+#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k48tbq92.fsf>