Author: jbeich Date: Fri Oct 12 05:42:38 2012 New Revision: 1071 Log: avoid thread-local variables before 8.3, 9.1, 10.0
Reference: http://svnweb.freebsd.org/changeset/base/225582 Reported by: angelv <[email protected]>, Reported by: Hanno Krusken<[email protected]> Deleted: trunk/mail/thunderbird-esr/files/patch-bug543241 trunk/mail/thunderbird/files/patch-bug543241 trunk/www/firefox-esr/files/patch-bug543241 trunk/www/firefox-nightly/files/patch-bug543241 trunk/www/firefox/files/patch-bug543241 trunk/www/libxul/files/patch-bug543241 trunk/www/seamonkey/files/patch-bug543241 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Oct 12 05:42:27 2012 (r1070) +++ trunk/Mk/bsd.gecko.mk Fri Oct 12 05:42:38 2012 (r1071) @@ -561,6 +561,12 @@ .endif .endif +.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900045) \ + || ${OSVERSION} < 802513 +MOZ_EXPORT+= ac_cv_thread_keyword=no \ + je_cv_tls_model=no +.endif + # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip Deleted: trunk/mail/thunderbird-esr/files/patch-bug543241 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: trunk/mail/thunderbird/files/patch-bug543241 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Deleted: trunk/www/firefox-esr/files/patch-bug543241 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./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 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: trunk/www/firefox-nightly/files/patch-bug543241 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./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 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Deleted: trunk/www/firefox/files/patch-bug543241 ============================================================================== --- trunk/www/firefox/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./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 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Deleted: trunk/www/libxul/files/patch-bug543241 ============================================================================== --- trunk/www/libxul/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./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 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: trunk/www/seamonkey/files/patch-bug543241 ============================================================================== --- trunk/www/seamonkey/files/patch-bug543241 Fri Oct 12 05:42:38 2012 (r1070) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -12,6 +12,10 @@ - #include "nsAutoPtr.h" - #include "nsCycleCollectorUtils.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - using namespace mozilla; - - #ifdef XP_WIN -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
