[oe-commits] org.oe.dev firefox 3: remove #if 0 from TLS checking code, replace _pthread_self() with 255255

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a5df1370b83b5dc274c0f6a90a6abe844992ffc9
ViewMTN: http://monotone.openembedded.org/revision/info/a5df1370b83b5dc274c0f6a90a6abe844992ffc9
Files:
1
packages/mozilla/firefox-2.0.0.14+3.0rc1
packages/mozilla/firefox-3.0
packages/mozilla/firefox_2.0.0.14+3.0rc1.bb
packages/mozilla/firefox_3.0.bb
packages/mozilla/firefox-3.0/jemalloc-tls.patch
Diffs:

#
# mt diff -r6ea8776caede0f06f3b372bd8b12887107c6cc59 -ra5df1370b83b5dc274c0f6a90a6abe844992ffc9
#
#
#
# rename "packages/mozilla/firefox-2.0.0.14+3.0rc1"
#     to "packages/mozilla/firefox-3.0"
# 
# rename "packages/mozilla/firefox_2.0.0.14+3.0rc1.bb"
#     to "packages/mozilla/firefox_3.0.bb"
# 
# add_file "packages/mozilla/firefox-3.0/jemalloc-tls.patch"
#  content [1b0a4d83fe236599c2badb4192ffcce2ae9f57ae]
# 
# patch "packages/mozilla/firefox_3.0.bb"
#  from [bf62db140979e7b94274730d22fe8418c70f6c11]
#    to [7d8dfe4756204ca334f979e2db6a75ac1e9c2ff9]
#
============================================================
--- packages/mozilla/firefox-3.0/jemalloc-tls.patch	1b0a4d83fe236599c2badb4192ffcce2ae9f57ae
+++ packages/mozilla/firefox-3.0/jemalloc-tls.patch	1b0a4d83fe236599c2badb4192ffcce2ae9f57ae
@@ -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.
============================================================
--- packages/mozilla/firefox_2.0.0.14+3.0rc1.bb	bf62db140979e7b94274730d22fe8418c70f6c11
+++ packages/mozilla/firefox_3.0.bb	7d8dfe4756204ca334f979e2db6a75ac1e9c2ff9
@@ -1,7 +1,7 @@ DEPENDS += "cairo"
 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/mo
 	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"