From owner-freebsd-gecko@FreeBSD.ORG Sun Aug 28 20:39:14 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 F170B106564A for ; Sun, 28 Aug 2011 20:39:14 +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 8345F8FC0A for ; Sun, 28 Aug 2011 20:39:14 +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 p7SKdD8a051749 for ; Sun, 28 Aug 2011 20:39:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p7SKd8j0050698 for freebsd-gecko@freebsd.org; Sun, 28 Aug 2011 20:39:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 28 Aug 2011 20:39:08 GMT Message-Id: <201108282039.p7SKd8j0050698@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] r618 - in branches/experimental/www/firefox: . 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: Sun, 28 Aug 2011 20:39:15 -0000 Author: andreast Date: Sun Aug 28 20:39:08 2011 New Revision: 618 Log: Add needed bits to be able to compile Firefox-6.0 on powerpc64. Unfortunately it still does not run. Added: branches/experimental/www/firefox/files/patch-js-src-ctypes-libffi-configure branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c (contents, props changed) Modified: branches/experimental/www/firefox/Makefile branches/experimental/www/firefox/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Aug 28 16:26:03 2011 (r617) +++ branches/experimental/www/firefox/Makefile Sun Aug 28 20:39:08 2011 (r618) @@ -59,6 +59,15 @@ WRKSRC:= ${WRKDIR}/mozilla-release +.if ${ARCH} == powerpc64 +.if ${OSVERSION} < 900033 +BROKEN= Needs binutils 2.17.50 to build +.else +CONFIGURE_ENV+= UNAME_m="powerpc64" +CFLAGS+= -mminimal-toc +.endif +.endif + .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui Modified: branches/experimental/www/firefox/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- branches/experimental/www/firefox/files/patch-ipc-chromium-src-build-build_config.h Sun Aug 28 16:26:03 2011 (r617) +++ branches/experimental/www/firefox/files/patch-ipc-chromium-src-build-build_config.h Sun Aug 28 20:39:08 2011 (r618) @@ -1,5 +1,5 @@ ---- ipc/chromium/src/build/build_config.h~ -+++ ipc/chromium/src/build/build_config.h +--- ipc/chromium/src/build/build_config.h.orig 2011-08-04 12:43:13.000000000 +0200 ++++ ipc/chromium/src/build/build_config.h 2011-08-27 22:09:08.000000000 +0200 @@ -17,7 +17,7 @@ // A set of macros to use for platform detection. #if defined(__APPLE__) @@ -9,3 +9,13 @@ #define OS_LINUX 1 #elif defined(_WIN32) #define OS_WIN 1 +@@ -57,6 +57,9 @@ + #define ARCH_CPU_ARMEL 1 + #define ARCH_CPU_32_BITS 1 + #define WCHAR_T_IS_UNSIGNED 1 ++#elif defined(__ppc64__) || defined(__powerpc64__) ++#define ARCH_CPU_PPC 1 ++#define ARCH_CPU_64_BITS 1 + #elif defined(__ppc__) || defined(__powerpc__) + #define ARCH_CPU_PPC 1 + #define ARCH_CPU_32_BITS 1 Added: branches/experimental/www/firefox/files/patch-js-src-ctypes-libffi-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-js-src-ctypes-libffi-configure Sun Aug 28 20:39:08 2011 (r618) @@ -0,0 +1,12 @@ +--- js/src/ctypes/libffi/configure.orig 2011-02-27 15:20:13.000000000 +0100 ++++ js/src/ctypes/libffi/configure 2011-02-27 15:20:52.000000000 +0100 +@@ -11280,6 +11280,9 @@ + powerpc-*-freebsd*) + TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc + ;; ++ powerpc64-*-freebsd*) ++ TARGET=POWERPC; TARGETDIR=powerpc ++ ;; + powerpc*-*-rtems*) + TARGET=POWERPC; TARGETDIR=powerpc + ;; Added: branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Sun Aug 28 20:39:08 2011 (r618) @@ -0,0 +1,45 @@ +--- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 ++++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 +@@ -733,6 +733,34 @@ + #endif + + #if defined(__ppc64__) ++#if defined(__FreeBSD__) ++#include ++#include ++ ++#include ++#include ++ ++unsigned long ++s_mpi_getProcessorLineSize() ++{ ++ static int cacheline_size = 0; ++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; ++ int clen; ++ ++ if (cacheline_size > 0) ++ return cacheline_size; ++ ++ clen = sizeof(cacheline_size); ++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), ++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) ++ return 128; /* guess */ ++ ++ return cacheline_size; ++} ++#else /* __FreeBSD__ */ ++ ++ ++ + /* + * Sigh, The PPC has some really nice features to help us determine cache + * size, since it had lots of direct control functions to do so. The POWER +@@ -786,6 +814,7 @@ + return 0; + } + ++#endif /* __FreeBSD__ */ + #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 + #endif + Modified: branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sun Aug 28 16:26:03 2011 (r617) +++ branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sun Aug 28 20:39:08 2011 (r618) @@ -1,5 +1,5 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-08-04 12:43:34.000000000 +0200 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-08-27 21:20:17.000000000 +0200 @@ -94,6 +94,9 @@ DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp @@ -58,6 +58,15 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp +@@ -350,7 +365,7 @@ + # + # Linux/PPC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) ++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp + ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s + AS := $(CC) -c -x assembler-with-cpp @@ -419,6 +434,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif