Date: Thu, 8 Oct 2009 16:02:44 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r134 - in branches/experimental/www/firefox3-devel: . files Message-ID: <200910081602.n98G2icB059075@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: andreast
Date: Thu Oct 8 16:02:43 2009
New Revision: 134
Log:
Fix sparc64 support.
Added:
branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in
branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp
Deleted:
branches/experimental/www/firefox3-devel/files/patch-js-src-configure
Modified:
branches/experimental/www/firefox3-devel/Makefile
Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile Wed Oct 7 13:16:34 2009 (r133)
+++ branches/experimental/www/firefox3-devel/Makefile Thu Oct 8 16:02:43 2009 (r134)
@@ -107,6 +107,7 @@
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
+ (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
port-pre-install:
# ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
Deleted: branches/experimental/www/firefox3-devel/files/patch-js-src-configure
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-js-src-configure Thu Oct 8 16:02:43 2009 (r133)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- js/src/configure.orig 2009-06-23 23:44:34.000000000 +0200
-+++ js/src/configure 2009-06-23 23:44:46.000000000 +0200
-@@ -6916,10 +6916,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- # Check whether --enable-jit or --disable-jit was given.
Added: branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in Thu Oct 8 16:02:43 2009 (r134)
@@ -0,0 +1,13 @@
+--- js/src/configure.in.orig 2009-09-21 00:26:58.000000000 +0200
++++ js/src/configure.in 2009-10-08 07:00:27.000000000 +0200
+@@ -2456,10 +2456,6 @@
+ ENABLE_JIT=1
+ NANOJIT_ARCH=ARM
+ ;;
+-sparc*-*)
+- ENABLE_JIT=1
+- NANOJIT_ARCH=Sparc
+- ;;
+ esac
+
+ MOZ_ARG_DISABLE_BOOL(jit,
Added: branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp Thu Oct 8 16:02:43 2009 (r134)
@@ -0,0 +1,18 @@
+--- js/src/jslock.cpp.orig 2009-10-07 20:15:38.000000000 +0200
++++ js/src/jslock.cpp 2009-10-07 21:36:14.000000000 +0200
+@@ -160,8 +160,13 @@
+ unsigned int res;
+
+ __asm__ __volatile__ (
+- "stbar\n"
+- "cas [%1],%2,%3\n"
++ "membar #StoreLoad | #LoadLoad\n"
++# if defined (__sparc64__)
++ "casx [%1],%2,%3\n"
++# else
++ "cas [%1],%2,%3\n" /* 32-bit version */
++# endif
++ "membar #StoreLoad | #LoadLoad\n"
+ "cmp %2,%3\n"
+ "be,a 1f\n"
+ "mov 1,%0\n"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910081602.n98G2icB059075>