[email protected] 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?
--- Begin Message ---
Florian Smeets <[email protected]> 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
--- End Message ---
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
