Date: Wed, 31 Aug 2011 23:55:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r621 - in branches/experimental/www/libxul: . files Message-ID: <201108312355.p7VNtmJY078634@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Aug 31 23:55:48 2011
New Revision: 621
Log:
first take to update libxul to 6.0
Added:
branches/experimental/www/libxul/files/patch-bugzilla-535300
branches/experimental/www/libxul/files/patch-bugzilla-659932
branches/experimental/www/libxul/files/patch-build-pgo-profileserver.py
branches/experimental/www/libxul/files/patch-build_unix_run-mozilla.sh
branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in
branches/experimental/www/libxul/files/patch-gfx-qcms-qcmstypes.h
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util.h
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_posix.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_file_posix.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h
branches/experimental/www/libxul/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/libxul/files/patch-js-src-config_config.mk
branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure
branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h
branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.cfg
branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.h
branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
branches/experimental/www/libxul/files/patch-toolkit_xre_Makefile.in
branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
Deleted:
branches/experimental/www/libxul/files/libsydney_oss
branches/experimental/www/libxul/files/patch-config-mkdepend-imakemdep.h
branches/experimental/www/libxul/files/patch-config_rules.mk
branches/experimental/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp
branches/experimental/www/libxul/files/patch-js-ctypes-libffi-configure
branches/experimental/www/libxul/files/patch-js-src-jslock.cpp
branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
branches/experimental/www/libxul/files/patch-modules-libpref-src-prefapi.cpp
branches/experimental/www/libxul/files/patch-security_coreconf_FreeBSD.mk
branches/experimental/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c
branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
branches/experimental/www/libxul/files/patch-xptcall-alpha
branches/experimental/www/libxul/files/patch-xptcall-amd64
branches/experimental/www/libxul/files/patch-xptcall-powerpc
branches/experimental/www/libxul/files/patch-xptcall-sparc64
branches/experimental/www/libxul/files/releng6_pulseaudio
Modified:
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul/distinfo
branches/experimental/www/libxul/files/patch-config_autoconf.mk.in
branches/experimental/www/libxul/files/patch-config_mkdepend_Makefile.in
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/libxul/files/patch-js-src-Makefile.in
branches/experimental/www/libxul/files/patch-js-src-configure.in
branches/experimental/www/libxul/files/patch-js_src_jsnum.cpp
branches/experimental/www/libxul/files/patch-layout_generic_Makefile.in
branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in
branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/Makefile Wed Aug 31 23:55:48 2011 (r621)
@@ -6,8 +6,7 @@
#
PORTNAME= libxul
-DISTVERSION= 1.9.2.17
-PORTREVISION= 1
+DISTVERSION= 6.0
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= xulrunner/releases/${DISTVERSION}/source
@@ -16,10 +15,13 @@
MAINTAINER?= gecko@FreeBSD.org
COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
-WRKSRC= ${WRKDIR}/mozilla-1.9.2
+BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
+ event-1.4:${PORTSDIR}/devel/libevent
+
+WRKSRC= ${WRKDIR}/mozilla-release
CONFLICTS= mozilla-[0-9]*
-GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
- lib/${MOZILLA}/include lib/${MOZILLA}/lib
USE_AUTOTOOLS= autoconf213
WANT_GNOME= yes
@@ -28,6 +30,7 @@
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GL= gl
MAKE_JOBS_SAFE= yes
MAKE_ENV= SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA}
LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
@@ -37,7 +40,7 @@
MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--disable-javaxpcom --enable-canvas \
--enable-system-cairo --disable-updater \
- --disable-necko-wifi --disable-ipc
+ --disable-necko-wifi --with-system-libevent=${LOCALBASE}
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO_OPTIONS= java debug logging optimized_cflags
@@ -52,13 +55,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
-.endif
-
.if ${ARCH} == powerpc64
.if ${OSVERSION} < 900033
BROKEN= Needs binutils 2.17.50 to build
@@ -75,19 +71,29 @@
notify.4:${PORTSDIR}/devel/libnotify
.endif
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
+.endif
+
post-patch:
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
+ -e 's|/proc/self/fd|/dev/fd|' \
+ -e 's|/proc["/]|/compat/linux&|'
+ @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
${WRKSRC}/storage/build/Makefile.in \
+ ${WRKSRC}/toolkit/library/Makefile.in \
${WRKSRC}/db/sqlite3/src/Makefile.in
- ${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
+ ${WRKSRC}/js/src/config/config.mk
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
s|echo aout|echo elf|g ; \
s|/usr/X11R6|${LOCALBASE}|g' \
- ${WRKSRC}/js/src/configure
+ ${WRKSRC}/js/src/configure.in
pre-configure:
+ (cd ${WRKSRC} && ${AUTOCONF})
(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
post-build:
Modified: branches/experimental/www/libxul/distinfo
==============================================================================
--- branches/experimental/www/libxul/distinfo Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/distinfo Wed Aug 31 23:55:48 2011 (r621)
@@ -1,2 +1,2 @@
-SHA256 (xulrunner-1.9.2.17.source.tar.bz2) = 6b2de4332f7f0a7b3a2afb6a496ac972db9799b4955e613130e7e574b82245e8
-SIZE (xulrunner-1.9.2.17.source.tar.bz2) = 51768448
+SHA256 (xulrunner-6.0.source.tar.bz2) = 62b5d9190f8a61aa1449042729e9065429c9d648167c5013190a9fc1fde1c37c
+SIZE (xulrunner-6.0.source.tar.bz2) = 67915896
Deleted: branches/experimental/www/libxul/files/libsydney_oss
==============================================================================
--- branches/experimental/www/libxul/files/libsydney_oss Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-17 14:21:06.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-08-17 14:21:53.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
Added: branches/experimental/www/libxul/files/patch-bugzilla-535300
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bugzilla-535300 Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,20 @@
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
+@@ -433,7 +433,16 @@
+ #ifdef ANDROID
+ path += "/lib";
+ #endif
+- newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
++ nsCString new_ld_lib_path;
++ if (ld_library_path && *ld_library_path) {
++ new_ld_lib_path.Assign(ld_library_path);
++ new_ld_lib_path.AppendLiteral(":");
++ new_ld_lib_path.Append(path.get());
++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
++ } else {
++ newEnvVars["LD_LIBRARY_PATH"] = path.get();
++ }
+ #elif OS_MACOSX
+ newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
+ #endif
Added: branches/experimental/www/libxul/files/patch-bugzilla-659932
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bugzilla-659932 Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,35 @@
+--- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400
++++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400
+@@ -114,6 +114,9 @@
+ typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+ PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+
++ typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
++ PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
++
+ typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+ PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+
+@@ -139,6 +142,7 @@
+ PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+
+ if (!glXQueryExtension ||
++ !glXQueryVersion ||
+ !glXChooseFBConfig ||
+ !glXGetVisualFromFBConfig ||
+ !glXCreatePixmap ||
+@@ -158,6 +162,14 @@
+ ///// Check that the GLX extension is present /////
+ if (!glXQueryExtension(dpy, NULL, NULL))
+ fatal_error("GLX extension missing");
++
++ ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 /////
++ int majorVersion, minorVersion;
++ if (!glXQueryVersion(dpy, &majorVersion, &minorVersion))
++ fatal_error("Unable to query GLX version");
++
++ if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
++ fatal_error("GLX version older than the required 1.3");
+
+ XSetErrorHandler(x_error_handler);
+
Added: branches/experimental/www/libxul/files/patch-build-pgo-profileserver.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-build-pgo-profileserver.py Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,18 @@
+--- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100
++++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100
+@@ -77,13 +77,13 @@
+ t.setDaemon(True) # don't hang on exit
+ t.start()
+
+- automation.setServerInfo("localhost", PORT)
++ automation.setServerInfo("127.0.0.1", PORT)
+ automation.initializeProfile(PROFILE_DIRECTORY)
+ browserEnv = automation.environment()
+ browserEnv["XPCOM_DEBUG_BREAK"] = "warn"
+ browserEnv["MOZ_JAR_LOG_DIR"] = MOZ_JAR_LOG_DIR
+
+- url = "http://localhost:%d/index.html" % PORT
++ url = "http://127.0.0.1:%d/index.html" % PORT
+ appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP)
+ status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY, {},
+ debuggerInfo=debuggerInfo,
Added: branches/experimental/www/libxul/files/patch-build_unix_run-mozilla.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-build_unix_run-mozilla.sh Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,12 @@
+--- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006
++++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006
+@@ -443,6 +443,9 @@
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox
++export MOZ_PLUGIN_PATH
++
+ if [ $moz_debug -eq 1 ]
+ then
+ moz_debug_program ${1+"$@"}
Deleted: branches/experimental/www/libxul/files/patch-config-mkdepend-imakemdep.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-config-mkdepend-imakemdep.h Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- "-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+ "-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- "-traditional",
Modified: branches/experimental/www/libxul/files/patch-config_autoconf.mk.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-config_autoconf.mk.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-config_autoconf.mk.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400
-+++ config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
+--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
+@@ -57,14 +57,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@@ -19,3 +19,12 @@
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS = @CPPFLAGS@
+ OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS = @LDFLAGS@
++OS_LDFLAGS = @LDFLAGS@ -lc
+
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
Modified: branches/experimental/www/libxul/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-config_mkdepend_Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-config_mkdepend_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,5 +1,5 @@
---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004
-+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004
+--- config/mkdepend/Makefile.in.orig 2009-04-28 08:07:48.532396203 +0000
++++ config/mkdepend/Makefile.in 2009-04-28 08:08:07.342398592 +0000
@@ -73,6 +73,7 @@
include $(topsrcdir)/config/rules.mk
Deleted: branches/experimental/www/libxul/files/patch-config_rules.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-config_rules.mk Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- config/rules.mk.orig Thu Sep 14 14:07:03 2006
-+++ config/rules.mk Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
-
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-configure.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,6 +1,6 @@
---- configure.in.orig 2009-10-29 23:11:31.000000000 +0100
-+++ configure.in 2009-11-16 19:51:19.000000000 +0100
-@@ -1352,7 +1352,7 @@
+--- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
++++ configure.in 2010-11-09 12:59:28.000000000 +0100
+@@ -1549,7 +1549,7 @@
CPU_ARCH=sparc
;;
@@ -9,14 +9,78 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -3582,8 +3582,8 @@
- *)
-
- AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
-- AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
-- AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
-+ AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"],
-+ AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"])))
- _SAVE_LIBS=$LIBS
- LIBS="$LIBS $_ICONV_LIBS"
- AC_CACHE_CHECK(
+@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
+ esac
+
+@@ -3803,19 +3803,21 @@
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
++_SAVE_LIBS=$LIBS
++AC_SEARCH_LIBS(clock_gettime, rt)
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
+ ac_cv_have_clock_monotonic,
+ [AC_TRY_LINK([#include <time.h>],
+ [ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts); ],
+ ac_cv_have_clock_monotonic=yes,
+ ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
++LIBS=$_SAVE_LIBS
+ if test "$ac_cv_have_clock_monotonic" = "yes"; then
+ HAVE_CLOCK_MONOTONIC=1
+- REALTIME_LIBS=-lrt
++ if test "$ac_cv_search_clock_gettime" != "none required"; then
++ REALTIME_LIBS=$ac_cv_search_clock_gettime
++ fi
+ AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(REALTIME_LIBS)
+@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+ ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+ ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
+@@ -6022,6 +6024,14 @@
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
++ FreeBSD:i386)
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ ;;
+ SunOS:x86)
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
Modified: branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,11 +1,11 @@
---- db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500
+--- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
++++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
@@ -45,6 +45,8 @@
include $(DEPTH)/config/autoconf.mk
+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
++OS_LIBS = %%PTHREAD_LIBS%% -lc
MODULE = sqlite3
LIBRARY_NAME = sqlite3
FORCE_SHARED_LIB = 1
Deleted: branches/experimental/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400
-+++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400
-@@ -53,7 +53,12 @@ static PRBool sRegistryIniti
- static PRUint32 sInitCounter = 0;
-
- #define HACK_AROUND_THREADING_ISSUES
--//#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if __FreeBSD_version < 700042
-+#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#endif
-+#endif
-
- #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
- // XXX hack class to clean up XPCOM when this module is unloaded
Added: branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100
++++ gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ CSRCS = iccread.c transform.c
+
+-ifeq (86,$(findstring 86,$(OS_TEST)))
++ifneq (,$(INTEL_ARCHITECTURE))
+ CSRCS += transform-sse2.c
+ ifdef _MSC_VER
+ ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64)
Added: branches/experimental/www/libxul/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-gfx-qcms-qcmstypes.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
++++ gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
+@@ -25,7 +25,7 @@
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
+ typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,10 @@
+--- ipc/chromium/src/base/atomicops_internals_mutex.cc~
++++ ipc/chromium/src/base/atomicops_internals_mutex.cc
+@@ -39,6 +39,7 @@
+ * ***** END LICENSE BLOCK ***** */
+
+ #include "base/atomicops.h"
++#include "base/lock.h"
+
+ namespace base {
+ namespace subtle {
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,13 @@
+--- ipc/chromium/src/base/file_util.h~
++++ ipc/chromium/src/base/file_util.h
+@@ -15,8 +15,9 @@
+ #elif defined(ANDROID)
+ #include <sys/stat.h>
+ #elif defined(OS_POSIX)
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <fts.h>
+-#include <sys/stat.h>
+ #endif
+
+ #include <stdio.h>
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/file_util_linux.cc~
++++ ipc/chromium/src/base/file_util_linux.cc
+@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) {
+ #ifdef ANDROID
+ return GetTempDir(path);
+ #else
+- *path = FilePath("/dev/shm");
++ *path = FilePath("/tmp");
+ return true;
+ #endif
+ }
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_posix.cc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/file_util_posix.cc~
++++ ipc/chromium/src/base/file_util_posix.cc
+@@ -30,6 +30,8 @@
+ #include "base/string_util.h"
+ #include "base/time.h"
+
++#define stat64 stat
++
+ namespace file_util {
+
+ #if defined(GOOGLE_CHROME_BUILD)
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_file_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_file_posix.cc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,10 @@
+--- ipc/chromium/src/base/platform_file_posix.cc~
++++ ipc/chromium/src/base/platform_file_posix.cc
+@@ -9,6 +9,7 @@
+ #ifdef ANDROID
+ #include <linux/stat.h>
+ #endif
++#include <sys/stat.h>
+
+ #include "base/logging.h"
+ #include "base/string_util.h"
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,25 @@
+--- ipc/chromium/src/base/platform_thread_posix.cc~
++++ ipc/chromium/src/base/platform_thread_posix.cc
+@@ -11,6 +11,7 @@
+ #include <mach/mach.h>
+ #elif defined(OS_LINUX)
+ #include <sys/syscall.h>
++#include <pthread_np.h>
+ #include <unistd.h>
+ #endif
+
+@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current
+ #if defined(OS_MACOSX)
+ return mach_thread_self();
+ #elif defined(OS_LINUX)
+- return syscall(__NR_gettid);
++#if __FreeBSD_version > 900030
++ return pthread_getthreadid_np();
++#else
++ long tid;
++ syscall(SYS_thr_self, &tid);
++ return tid;
++#endif
+ #endif
+ }
+
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h~
++++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h
+@@ -34,7 +34,7 @@
+ #include "base/third_party/nspr/prcpucfg_win.h"
+ #elif defined(__APPLE__)
+ #include "base/third_party/nspr/prcpucfg_mac.h"
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__FreeBSD__) || defined(ANDROID)
+ #include "base/third_party/nspr/prcpucfg_linux.h"
+ #else
+ #error Provide a prcpucfg.h appropriate for your platform
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,21 @@
+--- 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__)
+ #define OS_MACOSX 1
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__FreeBSD__) || defined(ANDROID)
+ #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
Deleted: branches/experimental/www/libxul/files/patch-js-ctypes-libffi-configure
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-ctypes-libffi-configure Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- js/ctypes/libffi/configure.orig 2010-07-22 23:54:58.000000000 +0200
-+++ js/ctypes/libffi/configure 2010-08-05 07:34:44.000000000 +0200
-@@ -21033,6 +21033,9 @@
- powerpc-*-aix* | rs6000-*-aix*)
- TARGET=POWERPC_AIX; TARGETDIR=powerpc
- ;;
-+ powerpc64-*-freebsd*)
-+ TARGET=POWERPC; TARGETDIR=powerpc
-+ ;;
- powerpc-*-freebsd*)
- TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- ;;
Modified: branches/experimental/www/libxul/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-js-src-Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,11 +1,41 @@
---- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200
-+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
+--- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
++++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lc
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+
+ VPATH += $(srcdir)/assembler \
+ $(srcdir)/assembler/wtf \
+@@ -469,6 +469,9 @@
+ else
+ #CPPSRCS += only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS += only_on_x86_64.cpp
++endif
endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS += only_on_arm.cpp
+@@ -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.
+-DEFINES += -D__STDC_LIMIT_MACROS
++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+
+ INCLUDES += -I$(srcdir)
+
+
+-@@ -793,7 +796,8 @@
++@@ -793,7 +796,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+ -EXTRA_LIBS += -pthread
+-+DEFINES += -DFREEBSD
+ +EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
Added: branches/experimental/www/libxul/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-js-src-config-mkdepend_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2009-04-28 08:17:55.069074748 +0000
++++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +0000
+@@ -72,7 +72,7 @@
+
+ include $(topsrcdir)/config/rules.mk
+
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
+
+ ifdef GNU_CC
+ _GCCDIR = $(shell $(CC) -print-file-name=include)
Added: branches/experimental/www/libxul/files/patch-js-src-config_config.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-js-src-config_config.mk Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,10 @@
+--- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
++++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+ $(OS_INCLUDES) \
+ $(NULL)
Modified: branches/experimental/www/libxul/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-configure.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-js-src-configure.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,13 +1,72 @@
---- js/src/configure.in.orig 2009-09-30 21:50:26.000000000 +0200
-+++ js/src/configure.in 2009-09-30 21:50:44.000000000 +0200
-@@ -2467,10 +2467,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
+--- js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200
++++ js/src/configure.in 2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -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)
+ ;;
+-x86_64*-*)
++amd64*-*)
+ ENABLE_TRACEJIT=1
+ NANOJIT_ARCH=X64
+ ENABLE_METHODJIT=1
+@@ -2723,23 +2723,23 @@
+ AC_DEFINE(JS_CPU_X64)
+ AC_DEFINE(JS_PUNBOX64)
+ ;;
+-arm*-*)
++x86_64*-*)
+ ENABLE_TRACEJIT=1
+- NANOJIT_ARCH=ARM
++ NANOJIT_ARCH=X64
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+- AC_DEFINE(JS_CPU_ARM)
+- AC_DEFINE(JS_NUNBOX32)
++ ENABLE_POLYIC_TYPED_ARRAY=1
++ AC_DEFINE(JS_CPU_X64)
++ AC_DEFINE(JS_PUNBOX64)
;;
-sparc*-*)
-- ENABLE_JIT=1
++arm*-*)
+ ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
-- ;;
++ NANOJIT_ARCH=ARM
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+- ENABLE_POLYIC_TYPED_ARRAY=1
+- AC_DEFINE(JS_CPU_SPARC)
++ AC_DEFINE(JS_CPU_ARM)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
esac
-
- MOZ_ARG_DISABLE_BOOL(jit,
+@@ -2796,6 +2796,10 @@
+ i?86-*)
+ AC_DEFINE(AVMPLUS_IA32)
+ ;;
++amd64*-*)
++ AC_DEFINE(AVMPLUS_AMD64)
++ AC_DEFINE(AVMPLUS_64BIT)
++ ;;
+ x86_64*-*)
+ AC_DEFINE(AVMPLUS_AMD64)
+ AC_DEFINE(AVMPLUS_64BIT)
Added: branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure Wed Aug 31 23:55:48 2011 (r621)
@@ -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
+ ;;
Deleted: branches/experimental/www/libxul/files/patch-js-src-jslock.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-jslock.cpp Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,18 +0,0 @@
---- 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"
Modified: branches/experimental/www/libxul/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-js_src_jsnum.cpp Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-js_src_jsnum.cpp Wed Aug 31 23:55:48 2011 (r621)
@@ -14,7 +14,7 @@
#else
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if defined(__FreeBSD__)
+#if __BSD_VISIBLE == 0
+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
+#endif
Modified: branches/experimental/www/libxul/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-layout_generic_Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-layout_generic_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig 2009-08-07 00:49:41.000000000 +0200
-+++ layout/generic/Makefile.in 2009-08-09 20:54:53.000000000 +0200
-@@ -187,9 +187,10 @@
- -I$(srcdir)/../../content/base/src \
+--- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200
++++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200
+@@ -159,9 +159,10 @@
-I$(srcdir)/../../content/html/content/src \
-I$(srcdir)/../../dom/base \
+ -I$(srcdir)/../../dom/plugins/base \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
Deleted: branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200
-@@ -59,7 +59,7 @@
-
- #include <sys/types.h>
-
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
Added: branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200
++++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ # endif
+ #elif defined(WIN32)
+ # define SA_LITTLE_ENDIAN 1
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ # if defined(__BIG_ENDIAN__)
+ # define SA_BIG_ENDIAN 1
+ # else
Added: branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,16 @@
+--- media/libvpx/vpx_config_c.c~
++++ media/libvpx/vpx_config_c.c
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
Added: branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,16 @@
+--- media/libvpx/vpx_config.h~
++++ media/libvpx/vpx_config.h
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
Deleted: branches/experimental/www/libxul/files/patch-modules-libpref-src-prefapi.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-modules-libpref-src-prefapi.cpp Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,102 +0,0 @@
-
-This bug is due to the fact, applications are restarted before extension
-defaults are loaded.
-
-To reproduce, choose any preference and set the values like:
-system default:
- pref("prefkey",systemvalue);
-extension default:
- pref("prefkey", extensiondefault);
-user pref:
- user_pref("prefkey", systemvalue);
-
-Next, trigger application behaviour similar to upgrade by removing compreg.dat
-from profile and start the application.
-
-Result:
-User sees extensiondefault after upgrade, because the user_pref has been
-eliminated ... which is definitly not what the user expects because he explicitly
-had *systemvalue* set before the upgrade.
-
-Evaluation:
-The bug happens because restart is performed *before* extension defaults have been
-loaded and the prefapi.cpp always eliminate user preference if the user preference
-is equal to the actual default (which happens to be extensiondefault normally - so
-no reset, but is systemvalue during restart).
-
-Fix:
-1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses
-whether a setting can be eliminated or not; it should be sufficient to only eliminate
-prefs in hashPrefs.
-
-2. This patch prevents hashPrefs from eliminating the user pref in case we are in
-*startup* ... unfortunately no such state info exists, which lets us guess that
-we are in startup for the previously not dealt case: !set_default &&
-!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref).
-
-If is the case we explicitly remember that this setting is a user-pref ...
-even though it might be temporarily equal to the default pref.
-
----
- modules/libpref/src/prefapi.cpp | 20 ++++++++++++++------
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
-Index: modules/libpref/src/prefapi.cpp
-===================================================================
---- modules/libpref/src/prefapi.cpp
-+++ modules/libpref/src/prefapi.cpp
-@@ -324,23 +324,20 @@
- if (!pref)
- return PL_DHASH_NEXT;
-
- nsCAutoString prefValue;
-
- // where we're getting our pref from
- PrefValue* sourcePref;
-
-- if (PREF_HAS_USER_VALUE(pref) &&
-- pref_ValueChanged(pref->defaultPref,
-- pref->userPref,
-- (PrefType) PREF_TYPE(pref)))
-- sourcePref = &pref->userPref;
-- else if (PREF_IS_LOCKED(pref))
-+ if (PREF_IS_LOCKED(pref))
- sourcePref = &pref->defaultPref;
-+ else if (PREF_HAS_USER_VALUE(pref))
-+ sourcePref = &pref->userPref;
- else
- // do not save default prefs that haven't changed
- return PL_DHASH_NEXT;
-
- // strings are in quotes!
- if (pref->flags & PREF_STRING) {
- prefValue = '\"';
- str_escape(sourcePref->stringVal, prefValue);
-@@ -742,16 +739,27 @@
- Otherwise, set the user value only if it has changed */
- if ( !pref_ValueChanged(pref->defaultPref, value, type) )
- {
- if (PREF_HAS_USER_VALUE(pref))
- {
- pref->flags &= ~PREF_USERSET;
- if (!PREF_IS_LOCKED(pref))
- valueChanged = PR_TRUE;
-+ } else {
-+ // this is tricky: we have !set_default ...
-+ // thus we are setting a user pref; however the user
-+ // pref set is same as *current default*; this normally
-+ // means to un-set ... however since we have
-+ // !PREF_HAS_USER_VALUE(pref) this can only be during
-+ // startup
-+ pref_SetValue(&pref->userPref, value, type);
-+ pref->flags |= PREF_USERSET;
-+ if (!PREF_IS_LOCKED(pref))
-+ valueChanged = PR_TRUE;
- }
- }
- else if ( !PREF_HAS_USER_VALUE(pref) ||
- pref_ValueChanged(pref->userPref, value, type) )
- {
- pref_SetValue(&pref->userPref, value, type);
- pref->flags |= PREF_USERSET;
- if (!PREF_IS_LOCKED(pref))
Added: branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.cfg
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.cfg Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,100 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100
+@@ -283,6 +283,97 @@
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD 8
+
++#elif defined(__powerpc64__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#define IS_64
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 8
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 8
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 64
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 64
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 6
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 6
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 8
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD 8
++
++#define PR_BYTES_PER_WORD_LOG2 3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#elif defined(__powerpc__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #else
+
+ #error "Unknown CPU architecture"
Added: branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-nsprpub-pr-include-md_freebsd.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,30 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100
+@@ -57,6 +57,10 @@
+ #define _PR_SI_ARCHITECTURE "ia64"
+ #elif defined(__amd64__)
+ #define _PR_SI_ARCHITECTURE "amd64"
++#elif defined(__powerpc64__)
++#define _PR_SI_ARCHITECTURE "powerpc64"
++#elif defined(__powerpc__)
++#define _PR_SI_ARCHITECTURE "powerpc"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+@@ -106,6 +110,16 @@
+ #define _PR_IPV6_V6ONLY_PROBE
+ #endif
+
++#if (__FreeBSD_version >= 700016)
++#if defined(_PR_PTHREADS)
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#define _PR_HAVE_GETHOST_R
++#define _PR_HAVE_GETHOST_R_INT
++#define _PR_HAVE_THREADSAFE_GETHOST
++#endif
++#endif
++
+ #define USE_SETJMP
+
+ #ifndef _PR_PTHREADS
Added: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,40 @@
+--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
++++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
+@@ -49,8 +49,20 @@
+ ifeq ($(CPU_ARCH),pc98)
+ CPU_ARCH = x86
+ endif
+-ifeq ($(CPU_ARCH),amd64)
+-CPU_ARCH = x86_64
++ifeq ($(OS_TEST),alpha)
++CPU_ARCH = alpha
++endif
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++endif
++ifeq ($(OS_TEST),ia64)
++CPU_ARCH = ia64
++endif
++ifeq ($(OS_TEST),powerpc)
++CPU_ARCH = powerpc
++endif
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH = sparc64
+ endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+@@ -78,7 +90,7 @@
+ DLL_SUFFIX = so.1.0
+ endif
+
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+ ifdef MAPFILE
+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -87,4 +99,4 @@
+
+ G++INCLUDES = -I/usr/include/g++
+
+-INCLUDES += -I/usr/X11R6/include
++#INCLUDES += -I/usr/local/include
Added: branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Wed Aug 31 23:55:48 2011 (r621)
@@ -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 <sys/stddef.h>
++#include <sys/sysctl.h>
++
++#include <machine/cpu.h>
++#include <machine/md_var.h>
++
++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
+
Deleted: branches/experimental/www/libxul/files/patch-security_coreconf_FreeBSD.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-security_coreconf_FreeBSD.mk Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,18 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig 2010-06-26 07:29:06.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2010-07-18 13:25:06.000000000 +0200
-@@ -49,9 +49,6 @@
- ifeq ($(CPU_ARCH),pc98)
- CPU_ARCH = x86
- endif
--ifeq ($(CPU_ARCH),amd64)
--CPU_ARCH = x86_64
--endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -87,4 +84,4 @@
-
- G++INCLUDES = -I/usr/include/g++
-
--INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/X11R6/include
Deleted: branches/experimental/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c
==============================================================================
--- branches/experimental/www/libxul/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,44 +0,0 @@
---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100
-+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100
-@@ -733,6 +733,33 @@
- #endif
-
- #if defined(__ppc64__)
-+#if defined(__FreeBSD__)
-+#include <sys/stddef.h>
-+#include <sys/sysctl.h>
-+
-+#include <machine/cpu.h>
-+#include <machine/md_var.h>
-+
-+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 +813,7 @@
- return 0;
- }
-
-+#endif /* __FreeBSD__ */
- #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
- #endif
-
Modified: branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Added: branches/experimental/www/libxul/files/patch-toolkit_xre_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-toolkit_xre_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,8 @@
+--- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400
++++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400
+@@ -263,5 +263,3 @@
+ libs:: platform.ini
+ $(INSTALL) $^ $(DIST)/bin
+
+-install::
+- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
Added: branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
Added: branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Wed Aug 31 23:55:48 2011 (r621)
@@ -0,0 +1,20 @@
+--- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
++++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
+@@ -45,7 +45,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -62,7 +62,7 @@
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Modified: branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Wed Aug 31 23:55:48 2011 (r621)
@@ -1,11 +1,11 @@
---- xpcom/base/nsStackWalk.cpp.orig 2010-01-11 02:11:49.000000000 -0500
-+++ xpcom/base/nsStackWalk.cpp 2010-01-11 02:13:26.000000000 -0500
-@@ -1132,7 +1132,7 @@
+--- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100
++++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100
+@@ -1137,7 +1137,7 @@
#define __USE_GNU
#endif
--#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
-+#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
+-#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
++#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
#include <dlfcn.h>
#endif
Deleted: branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Modified: branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Mon Aug 29 16:03:05 2011 (r620)
+++ branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Wed Aug 31 23:55:48 2011 (r621)
@@ -1,6 +1,6 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-04-02 16:03:13.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2010-06-06 19:19:44.000000000 +0000
-@@ -73,6 +73,9 @@
+--- 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
endif
@@ -10,7 +10,7 @@
endif
endif
-@@ -96,7 +99,7 @@
+@@ -117,7 +120,7 @@
endif
endif
# IA64 Linux
@@ -19,18 +19,20 @@
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -111,8 +114,8 @@
- #
- # FreeBSD/amd64
+@@ -130,6 +133,12 @@
+ CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
#
--ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
--CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
++# FreeBSD/amd64
++#
+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
++CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
++endif
++#
+ # Neutrino/Intel (uses the same unixish_x86 code)
#
- # BeOS/Intel (uses the same unixish_x86 code)
-@@ -165,9 +168,15 @@
+ ifeq ($(OS_TARGET),NTO)
+@@ -184,9 +193,15 @@
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
@@ -47,7 +49,7 @@
CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
endif
#
-@@ -322,7 +331,7 @@
+@@ -341,7 +356,7 @@
#
# Linux/PPC
#
@@ -56,20 +58,16 @@
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
-@@ -331,9 +340,9 @@
+@@ -350,7 +365,7 @@
#
# Linux/PPC64
#
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
--CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
--ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+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
+ 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
- endif
-
-@@ -400,6 +409,15 @@
+@@ -419,6 +434,15 @@
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
#
Deleted: branches/experimental/www/libxul/files/patch-xptcall-alpha
==============================================================================
--- branches/experimental/www/libxul/files/patch-xptcall-alpha Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+ {
-+ if(s->IsPtrData())
-+ {
-+ *d = (PRUint64)s->ptr;
-+ continue;
-+ }
-+ switch(s->type)
-+ {
-+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
-+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
-+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
-+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
-+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
-+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
-+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
-+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // convert floats to doubles if they are to be passed
-+ // via registers so we can just deal with doubles later
-+ union { PRUint64 u64; double d; } t;
-+ t.d = (double)s->val.f;
-+ *d = t.u64;
-+ }
-+ else
-+ // otherwise copy to stack normally
-+ *d = (PRUint64)s->val.u32;
-+ break;
-+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
-+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
-+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
-+ default:
-+ // all the others are plain pointer types
-+ *d = (PRUint64)s->val.p;
-+ break;
-+ }
-+ }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+ "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".globl XPTC_InvokeByIndex\n\t"
-+ ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+ ".frame $15,32,$26,0\n\t"
-+ ".mask 0x4008000,-32\n\t"
-+ "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+ "subq $30,32,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ "stq $15,8($30)\n\t"
-+ "bis $30,$30,$15\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
-+ * is required for storage of those passed via registers.
-+ */
-+
-+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
-+ "cmplt $2,$18,$1\n\t"
-+ "cmovne $1,$18,$2\n\t"
-+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
-+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
-+ "subq $30,$1,$30\n\t"
-+
-+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
-+ "stq $17,16($15)\n\t" /* save "methodIndex" */
-+
-+ "addq $30,8,$16\n\t" /* pass stack pointer */
-+ "bis $18,$18,$17\n\t" /* pass "paramCount" */
-+ "bis $19,$19,$18\n\t" /* pass "params" */
-+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
-+
-+ /*
-+ * Copy the first 6 parameters to registers and remove from stack frame.
-+ * Both the integer and floating point registers are set for each parameter
-+ * except the first which is the "this" pointer. (integer only)
-+ * The floating point registers are all set as doubles since the
-+ * invoke_copy_to_stack function should have converted the floats.
-+ */
-+ "ldq $16,0($30)\n\t" /* integer registers */
-+ "ldq $17,8($30)\n\t"
-+ "ldq $18,16($30)\n\t"
-+ "ldq $19,24($30)\n\t"
-+ "ldq $20,32($30)\n\t"
-+ "ldq $21,40($30)\n\t"
-+ "ldt $f17,8($30)\n\t" /* floating point registers */
-+ "ldt $f18,16($30)\n\t"
-+ "ldt $f19,24($30)\n\t"
-+ "ldt $f20,32($30)\n\t"
-+ "ldt $f21,40($30)\n\t"
-+
-+ "addq $30,48,$30\n\t" /* remove params from stack */
-+
-+ /*
-+ * Call the virtual function with the constructed stack frame.
-+ */
-+ "bis $16,$16,$1\n\t" /* load "this" */
-+ "ldq $2,16($15)\n\t" /* load "methodIndex" */
-+ "ldq $1,0($1)\n\t" /* load vtable */
-+#if 0
-+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+ "mulq $2, 8, $2\n\t"
-+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+ "addq $1,$2,$1\n\t"
-+ "ldq $27,0($1)\n\t" /* load address of function */
-+ "jsr $26,($27),0\n\t" /* call virtual function */
-+ "ldgp $29,0($26)\n\t"
-+
-+ "bis $15,$15,$30\n\t"
-+ "ldq $26,0($30)\n\t"
-+ "ldq $15,8($30)\n\t"
-+ "addq $30,32,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end XPTC_InvokeByIndex"
-+ );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+ const PRUint8 PARAM_BUFFER_COUNT = 16;
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+ PRUint64* ap = args + NUM_ARG_REGS;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
-+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
-+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
-+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
-+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
-+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
-+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
-+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // floats passed via registers are stored as doubles
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (PRUint64) args[i];
-+ dp->val.f = (float) dp->val.d; // convert double to float
-+ }
-+ else
-+ dp->val.u32 = (PRUint32) *ap;
-+ break;
-+ case nsXPTType::T_DOUBLE :
-+ // doubles passed via registers are also stored
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+ break;
-+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
-+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
-+ * passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+ "#### SharedStub ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+ ".frame $30,96,$26,0\n\t"
-+ ".mask 0x4000000,-96\n\t"
-+ "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+ "subq $30,96,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Store arguments passed via registers to the stack.
-+ * Floating point registers are stored as doubles and converted
-+ * to floats in PrepareAndDispatch if necessary.
-+ */
-+ "stt $f17,16($30)\n\t" /* floating point registers */
-+ "stt $f18,24($30)\n\t"
-+ "stt $f19,32($30)\n\t"
-+ "stt $f20,40($30)\n\t"
-+ "stt $f21,48($30)\n\t"
-+ "stq $17,56($30)\n\t" /* integer registers */
-+ "stq $18,64($30)\n\t"
-+ "stq $19,72($30)\n\t"
-+ "stq $20,80($30)\n\t"
-+ "stq $21,88($30)\n\t"
-+
-+ /*
-+ * Call PrepareAndDispatch function.
-+ */
-+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
-+ "addq $30,16,$18\n\t" /* pass "args" */
-+ "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+ "ldq $26,0($30)\n\t"
-+ "addq $30,96,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end SharedStub"
-+ );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+ );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ nsresult result; \
-+__asm__ __volatile__( \
-+ "ldah $29,0($27)\n\t" \
-+ "lda $29,0($29)\n\t" \
-+ "lda $1, "#n"\n\t" \
-+ "br $31, $SharedStub..ng\n\t" \
-+ "mov $0, %0\n\t" \
-+ : "=r" (result) \
-+ ); \
-+ return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
Deleted: branches/experimental/www/libxul/files/patch-xptcall-amd64
==============================================================================
--- branches/experimental/www/libxul/files/patch-xptcall-amd64 Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,380 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp.orig 2009-10-02 22:13:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp 2009-10-02 22:41:36.000000000 +0200
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+ nr_gpr = 1; // skip one GP register for 'that'
-+ nr_fpr = 0;
-+ nr_stack = 0;
-+
-+ /* Compute number of eightbytes of class MEMORY. */
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (!s->IsPtrData()
-+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+ if (nr_fpr < FPR_COUNT)
-+ nr_fpr++;
-+ else
-+ nr_stack++;
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ nr_gpr++;
-+ else
-+ nr_stack++;
-+ }
-+ }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint64 * gpregs, double * fpregs)
-+{
-+ PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+ PRUint32 nr_fpr = 0;
-+ PRUint64 value;
-+
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (s->IsPtrData())
-+ value = (PRUint64) s->ptr;
-+ else {
-+ switch (s->type) {
-+ case nsXPTType::T_FLOAT: break;
-+ case nsXPTType::T_DOUBLE: break;
-+ case nsXPTType::T_I8: value = s->val.i8; break;
-+ case nsXPTType::T_I16: value = s->val.i16; break;
-+ case nsXPTType::T_I32: value = s->val.i32; break;
-+ case nsXPTType::T_I64: value = s->val.i64; break;
-+ case nsXPTType::T_U8: value = s->val.u8; break;
-+ case nsXPTType::T_U16: value = s->val.u16; break;
-+ case nsXPTType::T_U32: value = s->val.u32; break;
-+ case nsXPTType::T_U64: value = s->val.u64; break;
-+ case nsXPTType::T_BOOL: value = s->val.b; break;
-+ case nsXPTType::T_CHAR: value = s->val.c; break;
-+ case nsXPTType::T_WCHAR: value = s->val.wc; break;
-+ default: value = (PRUint64) s->val.p; break;
-+ }
-+ }
-+
-+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+ if (nr_fpr < FPR_COUNT)
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((double *)d) = s->val.d;
-+ d++;
-+ }
-+ }
-+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+ if (nr_fpr < FPR_COUNT)
-+ // The value in %xmm register is already prepared to
-+ // be retrieved as a float. Therefore, we pass the
-+ // value verbatim, as a double without conversion.
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((float *)d) = s->val.f;
-+ d++;
-+ }
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ gpregs[nr_gpr++] = value;
-+ else
-+ *d++ = value;
-+ }
-+ }
-+}
-+
-+extern "C"
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports * that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+ PRUint32 nr_gpr, nr_fpr, nr_stack;
-+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+
-+ // Stack, if used, must be 16-bytes aligned
-+ if (nr_stack)
-+ nr_stack = (nr_stack + 1) & ~1;
-+
-+ // Load parameters to stack, if necessary
-+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+ PRUint64 gpregs[GPR_COUNT];
-+ double fpregs[FPR_COUNT];
-+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+ // Load FPR registers from fpregs[]
-+ register double d0 asm("xmm0");
-+ register double d1 asm("xmm1");
-+ register double d2 asm("xmm2");
-+ register double d3 asm("xmm3");
-+ register double d4 asm("xmm4");
-+ register double d5 asm("xmm5");
-+ register double d6 asm("xmm6");
-+ register double d7 asm("xmm7");
-+
-+ switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+ case N+1: d##N = fpregs[N];
-+ ARG_FPR(7);
-+ ARG_FPR(6);
-+ ARG_FPR(5);
-+ ARG_FPR(4);
-+ ARG_FPR(3);
-+ ARG_FPR(2);
-+ ARG_FPR(1);
-+ ARG_FPR(0);
-+ case 0:;
-+#undef ARG_FPR
-+ }
-+
-+ // Load GPR registers from gpregs[]
-+ register PRUint64 a0 asm("rdi");
-+ register PRUint64 a1 asm("rsi");
-+ register PRUint64 a2 asm("rdx");
-+ register PRUint64 a3 asm("rcx");
-+ register PRUint64 a4 asm("r8");
-+ register PRUint64 a5 asm("r9");
-+
-+ switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+ case N+1: a##N = gpregs[N];
-+ ARG_GPR(5);
-+ ARG_GPR(4);
-+ ARG_GPR(3);
-+ ARG_GPR(2);
-+ ARG_GPR(1);
-+ case 1: a0 = (PRUint64) that;
-+ case 0:;
-+#undef ARG_GPR
-+ }
-+
-+ // Ensure that assignments to SSE registers won't be optimized away
-+ asm("" ::
-+ "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+ "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+
-+ // Get pointer to method
-+ PRUint64 methodAddress = *((PRUint64 *)that);
-+ methodAddress += 8 * methodIndex;
-+ methodAddress = *((PRUint64 *)methodAddress);
-+
-+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+ return result;
-+}
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp.orig 2009-10-02 22:13:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp 2009-10-02 22:39:37.000000000 +0200
-@@ -0,0 +1,200 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller. The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT = 16;
-+const PRUint32 GPR_COUNT = 6;
-+const PRUint32 FPR_COUNT = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+//
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+ PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint32 paramCount;
-+ PRUint32 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no method info");
-+ if (! info)
-+ return NS_ERROR_UNEXPECTED;
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+ if (! dispatchParams)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+
-+ PRUint64* ap = args;
-+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that'
-+ PRUint32 nr_fpr = 0;
-+ PRUint64 value;
-+
-+ for(i = 0; i < paramCount; i++) {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+ if (nr_fpr < FPR_COUNT)
-+ dp->val.d = fpregs[nr_fpr++];
-+ else
-+ dp->val.d = *(double*) ap++;
-+ continue;
-+ }
-+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+ if (nr_fpr < FPR_COUNT)
-+ // The value in %xmm register is already prepared to
-+ // be retrieved as a float. Therefore, we pass the
-+ // value verbatim, as a double without conversion.
-+ dp->val.d = *(double*) ap++;
-+ else
-+ dp->val.f = *(float*) ap++;
-+ continue;
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ value = gpregs[nr_gpr++];
-+ else
-+ value = *ap++;
-+ }
-+
-+ if (param.IsOut() || !type.IsArithmetic()) {
-+ dp->val.p = (void*) value;
-+ continue;
-+ }
-+
-+ switch (type) {
-+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break;
-+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break;
-+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break;
-+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break;
-+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break;
-+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break;
-+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break;
-+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break;
-+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break;
-+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break;
-+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break;
-+
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->mOuter->CallMethod((PRUint16)methodIndex, info,
-+ dispatchParams);
-+
-+ if (dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section \".text\"\n\t" \
-+ ".align 2\n\t" \
-+ ".if " #n " < 10\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+ ".elseif " #n " < 100\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+ ".elseif " #n " < 1000\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+ ".else\n\t" \
-+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+ ".endif\n\t" \
-+ "movl $" #n ", %eax\n\t" \
-+ "jmp SharedStub\n\t" \
-+ ".if " #n " < 10\n\t" \
-+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+ ".elseif " #n " < 100\n\t" \
-+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+ ".else\n\t" \
-+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+ ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section \".text\"\n\t"
-+ ".align 2\n\t"
-+ ".type SharedStub,@function\n\t"
-+ "SharedStub:\n\t"
-+ // make room for gpregs (48), fpregs (64)
-+ "pushq %rbp\n\t"
-+ "movq %rsp,%rbp\n\t"
-+ "subq $112,%rsp\n\t"
-+ // save GP registers
-+ "movq %rdi,-112(%rbp)\n\t"
-+ "movq %rsi,-104(%rbp)\n\t"
-+ "movq %rdx, -96(%rbp)\n\t"
-+ "movq %rcx, -88(%rbp)\n\t"
-+ "movq %r8 , -80(%rbp)\n\t"
-+ "movq %r9 , -72(%rbp)\n\t"
-+ "leaq -112(%rbp),%rcx\n\t"
-+ // save FP registers
-+ "movsd %xmm0,-64(%rbp)\n\t"
-+ "movsd %xmm1,-56(%rbp)\n\t"
-+ "movsd %xmm2,-48(%rbp)\n\t"
-+ "movsd %xmm3,-40(%rbp)\n\t"
-+ "movsd %xmm4,-32(%rbp)\n\t"
-+ "movsd %xmm5,-24(%rbp)\n\t"
-+ "movsd %xmm6,-16(%rbp)\n\t"
-+ "movsd %xmm7, -8(%rbp)\n\t"
-+ "leaq -64(%rbp),%r8\n\t"
-+ // rdi has the 'self' pointer already
-+ "movl %eax,%esi\n\t"
-+ "leaq 16(%rbp),%rdx\n\t"
-+ "call PrepareAndDispatch\n\t"
-+ "leave\n\t"
-+ "ret\n\t"
-+ ".size SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
Deleted: branches/experimental/www/libxul/files/patch-xptcall-powerpc
==============================================================================
--- branches/experimental/www/libxul/files/patch-xptcall-powerpc Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,580 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s.orig 2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s 2009-09-27 10:01:48.000000000 +0200
-@@ -0,0 +1,110 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation. Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+# beard@netscape.com (Patrick Beard)
-+# waterson@netscape.com (Chris Waterson)
-+#
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+
-+ .section ".text"
-+ .align 2
-+ .globl NS_InvokeByIndex_P
-+ .type NS_InvokeByIndex_P,@function
-+
-+#
-+# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+# PRUint32 paramCount, nsXPTCVariant* params)
-+#
-+
-+NS_InvokeByIndex_P:
-+ stwu sp,-32(sp) # setup standard stack frame
-+ mflr r0 # save LR
-+ stw r3,8(sp) # r3 <= that
-+ stw r4,12(sp) # r4 <= methodIndex
-+ stw r30,16(sp)
-+ stw r31,20(sp)
-+
-+ stw r0,36(sp) # store LR backchain
-+ mr r31,sp
-+
-+ rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f
-+ addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96
-+ lwz r9,0(sp) # r9 = backchain
-+ neg r0,r0
-+ stwux r9,sp,r0 # reserve stack sapce and save SP backchain
-+
-+ addi r3,sp,8 # r3 <= args
-+ mr r4,r5 # r4 <= paramCount
-+ mr r5,r6 # r5 <= params
-+ add r6,r3,r10 # r6 <= gpregs ( == args + r10 )
-+ mr r30,r6 # store in r30 for use later...
-+ addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 )
-+
-+ bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs)
-+
-+ lfd f1,32(r30) # load FP registers with method parameters
-+ lfd f2,40(r30)
-+ lfd f3,48(r30)
-+ lfd f4,56(r30)
-+ lfd f5,64(r30)
-+ lfd f6,72(r30)
-+ lfd f7,80(r30)
-+ lfd f8,88(r30)
-+
-+ lwz r3,8(r31) # r3 <= that
-+ lwz r4,12(r31) # r4 <= methodIndex
-+ lwz r5,0(r3) # r5 <= vtable ( == *that )
-+
-+ slwi r4,r4,2 # convert to offset ( *= 4 )
-+ lwzx r0,r5,r4 # r0 <= methodpointer ( == vtable + offset )
-+
-+ lwz r4,4(r30) # load GP regs with method parameters
-+ lwz r5,8(r30)
-+ lwz r6,12(r30)
-+ lwz r7,16(r30)
-+ lwz r8,20(r30)
-+ lwz r9,24(r30)
-+ lwz r10,28(r30)
-+
-+ mtlr r0 # copy methodpointer to LR
-+ blrl # call method
-+
-+ lwz r30,16(r31) # restore r30 & r31
-+ lwz r31,20(r31)
-+
-+ lwz r11,0(sp) # clean up the stack
-+ lwz r0,4(r11)
-+ mtlr r0
-+ mr sp,r11
-+ blr
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp.orig 2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp 2009-09-27 09:58:59.000000000 +0200
-@@ -0,0 +1,141 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ * beard@netscape.com (Patrick Beard)
-+ * waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+// The purpose of NS_InvokeByIndex_P() is to map a platform
-+// indepenpent call to the platform ABI. To do that,
-+// NS_InvokeByIndex_P() has to determine the method to call via vtable
-+// access. The parameters for the method are read from the
-+// nsXPTCVariant* and prepared for th native ABI. For the Linux/PPC
-+// ABI this means that the first 8 integral and floating point
-+// parameters are passed in registers.
-+
-+#include "xptcprivate.h"
-+
-+// 8 integral parameters are passed in registers
-+#define GPR_COUNT 8
-+
-+// 8 floating point parameters are passed in registers, floats are
-+// promoted to doubles when passed in registers
-+#define FPR_COUNT 8
-+
-+extern "C" PRUint32
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ return PRUint32(((paramCount * 2) + 3) & ~3);
-+}
-+
-+extern "C" void
-+invoke_copy_to_stack(PRUint32* d,
-+ PRUint32 paramCount,
-+ nsXPTCVariant* s,
-+ PRUint32* gpregs,
-+ double* fpregs)
-+{
-+ PRUint32 gpr = 1; // skip one GP reg for 'that'
-+ PRUint32 fpr = 0;
-+ PRUint32 tempu32;
-+ PRUint64 tempu64;
-+
-+ for(uint32 i = 0; i < paramCount; i++, s++) {
-+ if(s->IsPtrData())
-+ tempu32 = (PRUint32) s->ptr;
-+ else {
-+ switch(s->type) {
-+ case nsXPTType::T_FLOAT: break;
-+ case nsXPTType::T_DOUBLE: break;
-+ case nsXPTType::T_I8: tempu32 = s->val.i8; break;
-+ case nsXPTType::T_I16: tempu32 = s->val.i16; break;
-+ case nsXPTType::T_I32: tempu32 = s->val.i32; break;
-+ case nsXPTType::T_I64: tempu64 = s->val.i64; break;
-+ case nsXPTType::T_U8: tempu32 = s->val.u8; break;
-+ case nsXPTType::T_U16: tempu32 = s->val.u16; break;
-+ case nsXPTType::T_U32: tempu32 = s->val.u32; break;
-+ case nsXPTType::T_U64: tempu64 = s->val.u64; break;
-+ case nsXPTType::T_BOOL: tempu32 = s->val.b; break;
-+ case nsXPTType::T_CHAR: tempu32 = s->val.c; break;
-+ case nsXPTType::T_WCHAR: tempu32 = s->val.wc; break;
-+ default: tempu32 = (PRUint32) s->val.p; break;
-+ }
-+ }
-+
-+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+ if (fpr < FPR_COUNT)
-+ fpregs[fpr++] = s->val.d;
-+ else {
-+ if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-+ *((double*) d) = s->val.d;
-+ d += 2;
-+ }
-+ }
-+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+ if (fpr < FPR_COUNT)
-+ fpregs[fpr++] = s->val.f; // if passed in registers, floats are promoted to doubles
-+ else
-+ *((float*) d++) = s->val.f;
-+ }
-+ else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-+ || s->type == nsXPTType::T_U64)) {
-+ if ((gpr + 1) < GPR_COUNT) {
-+ if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+ *((PRUint64*) &gpregs[gpr]) = tempu64;
-+ gpr += 2;
-+ }
-+ else {
-+ if ((PRUint32) d & 4) d++; // longlongs are 8-byte aligned on stack
-+ *((PRUint64*) d) = tempu64;
-+ d += 2;
-+ }
-+ }
-+ else {
-+ if (gpr < GPR_COUNT)
-+ gpregs[gpr++] = tempu32;
-+ else
-+ *d++ = tempu32;
-+ }
-+
-+ }
-+}
-+
-+extern "C"
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant* params);
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s.orig 2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s 2009-09-26 22:23:56.000000000 +0200
-@@ -0,0 +1,89 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation. Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+# beard@netscape.com (Patrick Beard)
-+# waterson@netscape.com (Chris Waterson)
-+#
-+
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+
-+ .section ".text"
-+ .align 2
-+ .globl SharedStub
-+ .type SharedStub,@function
-+
-+SharedStub:
-+ stwu sp,-112(sp) # room for
-+ # linkage (8),
-+ # gprData (32),
-+ # fprData (64),
-+ # stack alignment(8)
-+ mflr r0
-+ stw r0,116(sp) # save LR backchain
-+
-+ stw r4,12(sp) # save GP registers
-+ stw r5,16(sp) # (n.b. that we don't save r3
-+ stw r6,20(sp) # because PrepareAndDispatch() is savvy)
-+ stw r7,24(sp)
-+ stw r8,28(sp)
-+ stw r9,32(sp)
-+ stw r10,36(sp)
-+
-+ stfd f1,40(sp) # save FP registers
-+ stfd f2,48(sp)
-+ stfd f3,56(sp)
-+ stfd f4,64(sp)
-+ stfd f5,72(sp)
-+ stfd f6,80(sp)
-+ stfd f7,88(sp)
-+ stfd f8,96(sp)
-+
-+ # r3 has the 'self' pointer already
-+
-+ mr r4,r11 # r4 <= methodIndex selector, passed
-+ # via r11 in the nsXPTCStubBase::StubXX() call
-+
-+ addi r5,sp,120 # r5 <= pointer to callers args area,
-+ # beyond r3-r10/f1-f8 mapped range
-+
-+ addi r6,sp,8 # r6 <= gprData
-+ addi r7,sp,40 # r7 <= fprData
-+
-+ bl PrepareAndDispatch@local # Go!
-+
-+ lwz r0,116(sp) # restore LR
-+ mtlr r0
-+ la sp,112(sp) # clean up the stack
-+ blr
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp.orig 2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp 2009-09-26 22:43:57.000000000 +0200
-@@ -0,0 +1,228 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ * beard@netscape.com (Patrick Beard)
-+ * waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+// The PPC/SYSV ABI passes the first 8 integral
-+// parameters and the first 8 floating point parameters in registers
-+// (r3-r10 and f1-f8), no stack space is allocated for these by the
-+// caller. The rest of the parameters are passed in the callers stack
-+// area. The stack pointer has to retain 16-byte alignment, longlongs
-+// and doubles are aligned on 8-byte boundaries.
-+
-+#define PARAM_BUFFER_COUNT 16
-+#define GPR_COUNT 8
-+#define FPR_COUNT 8
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gprData[]' contains the arguments passed in integer registers
-+// - 'fprData[]' contains the arguments passed in floating point registers
-+//
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self,
-+ PRUint32 methodIndex,
-+ PRUint32* args,
-+ PRUint32 *gprData,
-+ double *fprData)
-+{
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ const nsXPTMethodInfo* info = NULL;
-+ PRUint32 paramCount;
-+ PRUint32 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no method info");
-+ if (! info)
-+ return NS_ERROR_UNEXPECTED;
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+ if (! dispatchParams)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+
-+ PRUint32* ap = args;
-+ PRUint32 gpr = 1; // skip one GPR register
-+ PRUint32 fpr = 0;
-+ PRUint32 tempu32;
-+ PRUint64 tempu64;
-+
-+ for(i = 0; i < paramCount; i++) {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+ if (fpr < FPR_COUNT)
-+ dp->val.d = fprData[fpr++];
-+ else {
-+ if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
-+ dp->val.d = *(double*) ap;
-+ ap += 2;
-+ }
-+ continue;
-+ }
-+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+ if (fpr < FPR_COUNT)
-+ dp->val.f = (float) fprData[fpr++]; // in registers floats are passed as doubles
-+ else
-+ dp->val.f = *(float*) ap++;
-+ continue;
-+ }
-+ else if (!param.IsOut() && (type == nsXPTType::T_I64
-+ || type == nsXPTType::T_U64)) {
-+ if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+ if ((gpr + 1) < GPR_COUNT) {
-+ tempu64 = *(PRUint64*) &gprData[gpr];
-+ gpr += 2;
-+ }
-+ else {
-+ if ((PRUint32) ap & 4) ap++; // longlongs are 8-byte aligned on stack
-+ tempu64 = *(PRUint64*) ap;
-+ ap += 2;
-+ }
-+ }
-+ else {
-+ if (gpr < GPR_COUNT)
-+ tempu32 = gprData[gpr++];
-+ else
-+ tempu32 = *ap++;
-+ }
-+
-+ if(param.IsOut() || !type.IsArithmetic()) {
-+ dp->val.p = (void*) tempu32;
-+ continue;
-+ }
-+
-+ switch(type) {
-+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) tempu32; break;
-+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) tempu32; break;
-+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) tempu32; break;
-+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) tempu64; break;
-+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) tempu32; break;
-+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) tempu32; break;
-+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) tempu32; break;
-+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) tempu64; break;
-+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) tempu32; break;
-+ case nsXPTType::T_CHAR: dp->val.c = (char) tempu32; break;
-+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) tempu32; break;
-+
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->mOuter->CallMethod((PRUint16)methodIndex,
-+ info,
-+ dispatchParams);
-+
-+ if (dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+
-+}
-+
-+// Load r11 with the constant 'n' and branch to SharedStub().
-+
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n) \
-+__asm__ ( \
-+ ".align 2 \n\t" \
-+ ".if "#n" < 10 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
-+ \
-+ ".elseif "#n" < 100 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
-+ \
-+ ".elseif "#n" < 1000 \n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
-+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
-+ \
-+ ".else \n\t" \
-+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
-+ ".endif \n\t" \
-+ \
-+ "li 11,"#n" \n\t" \
-+ "b SharedStub@local \n" \
-+);
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
Deleted: branches/experimental/www/libxul/files/patch-xptcall-sparc64
==============================================================================
--- branches/experimental/www/libxul/files/patch-xptcall-sparc64 Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,329 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp.orig 2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp 2009-09-30 23:09:48.000000000 +0200
-@@ -0,0 +1,125 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT 16
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no method info");
-+ if (! info)
-+ return NS_ERROR_UNEXPECTED;
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ if (! dispatchParams)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+
-+ PRUint64* ap = args;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
-+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
-+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
-+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->mOuter->CallMethod((PRUint16)methodIndex, info,
-+ dispatchParams);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ int dummy; /* defeat tail-call optimization */ \
-+ return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s.orig 2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s 2009-09-30 22:48:25.000000000 +0200
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+ Platform specific code to invoke XPCOM methods on native objects
-+ for sparcv9 Solaris.
-+
-+ See the SPARC Compliance Definition (SCD) Chapter 3
-+ for more information about what is going on here, including
-+ the use of BIAS (0x7ff).
-+ The SCD is available from http://www.sparc.com/.
-+*/
-+
-+ .global NS_InvokeByIndex_P
-+ .type NS_InvokeByIndex_P, #function
-+
-+/*
-+ NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant* params);
-+
-+*/
-+NS_InvokeByIndex_P:
-+ save %sp,-(128 + 64),%sp ! room for the register window and
-+ ! struct pointer, rounded up to 0 % 64
-+ sll %i2,4,%l0 ! assume the worst case
-+ ! paramCount * 2 * 8 bytes
-+ cmp %l0, 0 ! are there any args? If not,
-+ be .invoke ! no need to copy args to stack
-+ nop
-+
-+ sub %sp,%l0,%sp ! create the additional stack space
-+ add %sp,0x7ff+136,%o0 ! step past the register window, the
-+ ! struct result pointer and the 'this' slot
-+ mov %i2,%o1 ! paramCount
-+ call invoke_copy_to_stack
-+ mov %i3,%o2 ! params
-+
-+!
-+! load arguments from stack into the outgoing registers
-+! BIAS is 0x7ff (2047)
-+!
-+
-+! load the %o1..5 64bit (extended word) output registers registers
-+ ldx [%sp + 0x7ff + 136],%o1 ! %i1
-+ ldx [%sp + 0x7ff + 144],%o2 ! %i2
-+ ldx [%sp + 0x7ff + 152],%o3 ! %i3
-+ ldx [%sp + 0x7ff + 160],%o4 ! %i4
-+ ldx [%sp + 0x7ff + 168],%o5 ! %i5
-+
-+! load the even number double registers starting with %d2
-+ ldd [%sp + 0x7ff + 136],%f2
-+ ldd [%sp + 0x7ff + 144],%f4
-+ ldd [%sp + 0x7ff + 152],%f6
-+ ldd [%sp + 0x7ff + 160],%f8
-+ ldd [%sp + 0x7ff + 168],%f10
-+ ldd [%sp + 0x7ff + 176],%f12
-+ ldd [%sp + 0x7ff + 184],%f14
-+ ldd [%sp + 0x7ff + 192],%f16
-+ ldd [%sp + 0x7ff + 200],%f18
-+ ldd [%sp + 0x7ff + 208],%f20
-+ ldd [%sp + 0x7ff + 216],%f22
-+ ldd [%sp + 0x7ff + 224],%f24
-+ ldd [%sp + 0x7ff + 232],%f26
-+ ldd [%sp + 0x7ff + 240],%f28
-+ ldd [%sp + 0x7ff + 248],%f30
-+
-+!
-+! calculate the target address from the vtable
-+!
-+.invoke:
-+ sll %i1,3,%l0 ! index *= 8
-+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
-+ ldx [%i0],%l1 ! *that --> address of vtable
-+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
-+
-+ jmpl %l0,%o7 ! call the routine
-+ mov %i0,%o0 ! move 'this' pointer to out register
-+
-+ mov %o0,%i0 ! propagate return value
-+ ret
-+ restore
-+
-+ .size NS_InvokeByIndex_P, .-NS_InvokeByIndex_P
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp.orig 2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp 2009-09-30 22:48:25.000000000 +0200
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ /*
-+ We need to copy the parameters for this function to locals and use them
-+ from there since the parameters occupy the same stack space as the stack
-+ we're trying to populate.
-+ */
-+ PRUint64 *l_d = d;
-+ nsXPTCVariant *l_s = s;
-+ PRUint64 l_paramCount = paramCount;
-+ PRUint64 regCount = 0; // return the number of registers to load from the stack
-+
-+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+ {
-+ if (regCount < 5) regCount++;
-+
-+ if (l_s->IsPtrData())
-+ {
-+ *l_d = (PRUint64)l_s->ptr;
-+ continue;
-+ }
-+ switch (l_s->type)
-+ {
-+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
-+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
-+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
-+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
-+
-+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
-+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
-+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
-+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
-+
-+ /* in the case of floats, we want to put the bits in to the
-+ 64bit space right justified... floats in the paramter array on
-+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+ the space that would be occupied by %f0, %f2, etc.
-+ */
-+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
-+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
-+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
-+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
-+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
-+
-+ default:
-+ // all the others are plain pointer types
-+ *((void**)l_d) = l_s->val.p;
-+ break;
-+ }
-+ }
-+
-+ return regCount;
-+}
Deleted: branches/experimental/www/libxul/files/releng6_pulseaudio
==============================================================================
--- branches/experimental/www/libxul/files/releng6_pulseaudio Wed Aug 31 23:55:48 2011 (r620)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,32 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 17:22:08.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 17:22:36.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
---- toolkit/library/Makefile.in.orig 2009-08-11 17:22:45.000000000 +0200
-+++ toolkit/library/Makefile.in 2009-08-11 17:23:22.000000000 +0200
-@@ -231,12 +231,12 @@
- endif
-
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108312355.p7VNtmJY078634>