firefox 3: remove #if 0 from TLS checking code, replace _pthread_self() with 255255

12 files changed, 31 insertions, 2 deletions

diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/.mtn2git_empty b/packages/mozilla/firefox-3.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/.mtn2git_empty
+++ b/packages/mozilla/firefox-3.0/.mtn2git_empty
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff b/packages/mozilla/firefox-3.0/010_FPU_IS_ARM_FPA_xslt.diff
index 854100c4c3..854100c4c3 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff
+++ b/packages/mozilla/firefox-3.0/010_FPU_IS_ARM_FPA_xslt.diff
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff b/packages/mozilla/firefox-3.0/Bug339782.additional.fix.diff
index 0848e730d3..0848e730d3 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff
+++ b/packages/mozilla/firefox-3.0/Bug339782.additional.fix.diff
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff b/packages/mozilla/firefox-3.0/Bug385583.nspr.jmp_buf.eabi.diff
index 486440c30e..486440c30e 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff
+++ b/packages/mozilla/firefox-3.0/Bug385583.nspr.jmp_buf.eabi.diff
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff b/packages/mozilla/firefox-3.0/Bug405992.atomic.nspr.diff
index f54f916a6a..f54f916a6a 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff
+++ b/packages/mozilla/firefox-3.0/Bug405992.atomic.nspr.diff
diff --git a/packages/mozilla/firefox-3.0/jemalloc-tls.patch b/packages/mozilla/firefox-3.0/jemalloc-tls.patch
new file mode 100644
index 0000000000..d1d740989e
--- /dev/null
+++ b/packages/mozilla/firefox-3.0/jemalloc-tls.patch
@@ -0,0 +1,28 @@
+--- /tmp/jemalloc.c	2008-06-23 10:57:36.000000000 +0200
++++ mozilla/memory/jemalloc/jemalloc.c	2008-06-23 11:20:13.000000000 +0200
+@@ -386,7 +386,7 @@
+ #else
+ #  define NO_TLS
+ #endif
+-#if 0
++
+ #ifdef __i386__
+ #  define QUANTUM_2POW_MIN	4
+ #  define SIZEOF_PTR_2POW	2
+@@ -420,7 +420,6 @@
+ #  define QUANTUM_2POW_MIN	4
+ #  define SIZEOF_PTR_2POW	2
+ #endif
+-#endif
+ 
+ #define	SIZEOF_PTR		(1U << SIZEOF_PTR_2POW)
+ 
+@@ -2582,7 +2581,7 @@
+ 		 * knowledge of how _pthread_self() calculates values, we can't
+ 		 * easily do much better than this.
+ 		 */
+-		ind = (unsigned long) _pthread_self() % narenas;
++		ind = 255255 % narenas;
+ 
+ 		/*
+ 		 * Optimistially assume that arenas[ind] has been initialized.
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-3.0/jsautocfg-dontoverwrite.patch
index 39978cfd11..39978cfd11 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch
+++ b/packages/mozilla/firefox-3.0/jsautocfg-dontoverwrite.patch
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch b/packages/mozilla/firefox-3.0/linkage-problem.patch
index 28bffd1e22..28bffd1e22 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch
+++ b/packages/mozilla/firefox-3.0/linkage-problem.patch
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig b/packages/mozilla/firefox-3.0/mozconfig
index 6e85c5eda2..6e85c5eda2 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig
+++ b/packages/mozilla/firefox-3.0/mozconfig
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff b/packages/mozilla/firefox-3.0/random_to_urandom.diff
index f969752381..f969752381 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff
+++ b/packages/mozilla/firefox-3.0/random_to_urandom.diff
diff --git a/packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch b/packages/mozilla/firefox-3.0/security-cross.patch
index 56c8d04a9e..56c8d04a9e 100644
--- a/packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch
+++ b/packages/mozilla/firefox-3.0/security-cross.patch
diff --git a/packages/mozilla/firefox_2.0.0.14+3.0rc1.bb b/packages/mozilla/firefox_3.0.bb
index 431a069d5f..5e693a1692 100644
--- a/packages/mozilla/firefox_2.0.0.14+3.0rc1.bb
+++ b/packages/mozilla/firefox_3.0.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
-PR = "r3"
+PR = "r0"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0rc1/source/firefox-3.0rc1-source.tar.bz2 \
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
@@ -9,6 +9,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0rc1/source
 	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
 	file://Bug405992.atomic.nspr.diff;patch=1 \
 	file://random_to_urandom.diff;patch=1 \
+	file://jemalloc-tls.patch;patch=1 \
 "
 
 S = "${WORKDIR}/mozilla"