From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 28 16:44:43 2011 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DE2B106564A for ; Wed, 28 Sep 2011 16:44:43 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 194258FC08 for ; Wed, 28 Sep 2011 16:44:42 +0000 (UTC) Received: from [192.168.1.38] (179-92.1-85.cust.bluewin.ch [85.1.92.179]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p8SGUuj1072464 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES128-SHA bits=128 verify=NO); Wed, 28 Sep 2011 16:31:34 GMT (envelope-from beat@FreeBSD.org) Mime-Version: 1.0 (Apple Message framework v1244.3) Content-Type: text/plain; charset=us-ascii From: =?iso-8859-1?Q?Beat_G=E4tzi?= In-Reply-To: <86k48tbq92.fsf@gmail.com> Date: Wed, 28 Sep 2011 18:30:54 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <87E83CA3-4339-4D08-B65B-65E602535C8C@FreeBSD.org> References: <201109271557.p8RFvhkB091814@trillian.chruetertee.ch> <86k48tbq92.fsf@gmail.com> To: h h X-Mailer: Apple Mail (2.1244.3) Cc: 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 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Sep 2011 16:44:43 -0000 On Sep 27, 2011, at 11:59 PM, h h wrote: > svn-freebsd-gecko@chruetertee.ch writes: >=20 >> Author: beat >> Date: Tue Sep 27 15:57:43 2011 >> New Revision: 628 >>=20 >> Log: >> - Update Firefox to 7.0 > [...] >> Added: = branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadMana= ger.cpp >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- /dev/null 00:00:00 1970 (empty, because file is newly = added) >> +++ = branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadMana= ger.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 =3D mozilla::threads::Generic; >> ++#endif >> + if (!mThreadsByPRThread.Init()) >> + return NS_ERROR_OUT_OF_MEMORY; >> +=20 >>=20 >=20 > So, are you going to keep workaround unconditionally? No, I was not aware that the patch wasn't complete. I committed your = patch a couple of minutes ago. Thanks, Beat=