From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 8 16:02:51 2009 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E818F1065679 for ; Thu, 8 Oct 2009 16:02:50 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 761958FC22 for ; Thu, 8 Oct 2009 16:02:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id n98G2ntu060293 for ; Thu, 8 Oct 2009 16:02:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id n98G2icB059075 for freebsd-gecko@freebsd.org; Thu, 8 Oct 2009 16:02:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 8 Oct 2009 16:02:44 GMT Message-Id: <200910081602.n98G2icB059075@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r134 - in branches/experimental/www/firefox3-devel: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2009 16:02:51 -0000 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"