From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 2 00:12:21 2011 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 56FBE106566B for ; Thu, 2 Jun 2011 00:12:21 +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 01FBA8FC1B for ; Thu, 2 Jun 2011 00:12:20 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p520CJJx020460 for ; Thu, 2 Jun 2011 00:12:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p520CEuP019868 for freebsd-gecko@freebsd.org; Thu, 2 Jun 2011 00:12:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 2 Jun 2011 00:12:14 GMT Message-Id: <201106020012.p520CEuP019868@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] r553 - branches/experimental/www/firefox-aurora/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, 02 Jun 2011 00:12:21 -0000 Author: flo Date: Thu Jun 2 00:12:14 2011 New Revision: 553 Log: - fix build on amd64 Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Tue May 31 23:14:50 2011 (r552) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Thu Jun 2 00:12:14 2011 (r553) @@ -1,6 +1,25 @@ ---- js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 -+++ js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 -@@ -612,7 +612,7 @@ +--- js/src/Makefile.in.orig 2011-06-01 00:33:48.000000000 +0200 ++++ js/src/Makefile.in 2011-06-02 01:36:58.745440491 +0200 +@@ -416,7 +416,7 @@ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter amd64 arm% sparc %86 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ +@@ -470,6 +470,9 @@ + #CPPSRCS += only_on_x86.cpp + endif + endif ++ifeq (amd64, $(TARGET_CPU)) ++#CPPSRCS += only_on_x86_64.cpp ++endif + ifeq (arm, $(TARGET_CPU)) + #CPPSRCS += only_on_arm.cpp + endif +@@ -739,7 +742,7 @@ # to reliably get limit macros defined, we'd always have to define the # one below before including any header, but that's obscure and # fragile, so we do it here. @@ -9,7 +28,7 @@ INCLUDES += -I$(srcdir) -@@ -666,7 +666,8 @@ +@@ -793,7 +796,8 @@ endif # WINNT ifeq ($(OS_ARCH),FreeBSD) Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Tue May 31 23:14:50 2011 (r552) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Thu Jun 2 00:12:14 2011 (r553) @@ -1,5 +1,14 @@ --- js/src/configure.in.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/configure.in 2011-06-01 00:53:19.326440014 +0200 ++++ js/src/configure.in 2011-06-01 09:12:10.225441827 +0200 +@@ -1495,7 +1495,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + @@ -2713,7 +2713,7 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) @@ -35,3 +44,40 @@ AC_DEFINE(AVMPLUS_AMD64) AC_DEFINE(AVMPLUS_64BIT) ;; +@@ -3367,11 +3357,11 @@ + ;; + *) + MOZ_CHECK_PTHREADS(pthreads, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", + MOZ_CHECK_PTHREADS(pthread, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c_r, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c, + USE_PTHREADS=1 + ) +@@ -3446,18 +3436,18 @@ + *-*-freebsd*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + else +- _PTHREAD_LDFLAGS="-lc_r" ++ _PTHREAD_LDFLAGS="-pthread" + fi + ;; + + *-*-openbsd*|*-*-bsdi*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + fi