Date: Sat, 30 Jun 2012 22:55:47 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r822 - in branches/experimental: mail/thunderbird mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox-nightly/files www/firefox/files www/firefox36 www/firefox36/files www/kompozer www/kompozer/files www/libxul www/libxul/files www/libxul19 www/libxul19/files www/seamonkey www/seamonkey/files Message-ID: <201206302255.q5UMtlGb051595@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jun 30 22:55:47 2012 New Revision: 822 Log: reduce silly patching - leverage upstream x86_64 support - files/patch-xptcall-${ARCH} are unused/obsolete - sparc64 xptcall support comes from openbsd, make it consistent with the rest of the file Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-build-autoconf-config.sub branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub branches/experimental/mail/thunderbird3/files/patch-mozilla-configure.in branches/experimental/www/firefox-esr/files/patch-gfx-qcms-Makefile.in branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in branches/experimental/www/firefox/files/patch-gfx-qcms-Makefile.in branches/experimental/www/kompozer/files/patch-xptcall-alpha branches/experimental/www/kompozer/files/patch-xptcall-ia64 branches/experimental/www/kompozer/files/patch-xptcall-powerpc branches/experimental/www/kompozer/files/patch-xptcall-sparc64 branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in branches/experimental/www/libxul19/files/patch-xptcall-alpha branches/experimental/www/libxul19/files/patch-xptcall-amd64 branches/experimental/www/libxul19/files/patch-xptcall-powerpc branches/experimental/www/libxul19/files/patch-xptcall-sparc64 branches/experimental/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub branches/experimental/www/seamonkey/files/patch-xptcall-amd64 branches/experimental/www/seamonkey/files/patch-xptcall-ia64 branches/experimental/www/seamonkey/files/patch-xptcall-sparc64 Modified: branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird-esr/files/patch-configure.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird/files/patch-configure.in branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/mail/thunderbird3/Makefile branches/experimental/mail/thunderbird3/files/patch-configure.in branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-esr/files/patch-configure.in branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in branches/experimental/www/firefox-esr/files/patch-js-src-configure.in branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/files/patch-configure.in branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/firefox/Makefile branches/experimental/www/firefox/files/patch-configure.in branches/experimental/www/firefox/files/patch-js-src-Makefile.in branches/experimental/www/firefox/files/patch-js-src-configure.in branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/firefox36/Makefile branches/experimental/www/firefox36/files/patch-configure.in branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/kompozer/Makefile branches/experimental/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/www/libxul/Makefile branches/experimental/www/libxul/files/patch-configure.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-security-coreconf-FreeBSD.mk branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/libxul19/Makefile branches/experimental/www/libxul19/files/patch-configure.in branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey/files/patch-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -64,7 +64,9 @@ WRKSRC= ${WRKDIR}/comm-esr10 MOZSRC:= ${WRKSRC}/mozilla -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,42 +1,5 @@ --- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 +++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1430,7 +1430,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -1753,7 +1753,7 @@ - esac - - case "${host_cpu}" in -- x86_64) -+ amd64 | x86_64) - HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" - ;; - esac -@@ -2415,6 +2415,9 @@ - x86_64-*) - AC_DEFINE(_AMD64_) - ;; -+ amd64*) -+ AC_DEFINE(_AMD64_) -+ ;; - *) - AC_DEFINE(_CPU_ARCH_NOT_DEFINED) - ;; @@ -2486,7 +2489,7 @@ else DLL_SUFFIX=".so.1.0" Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 +++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -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) @@ -85,7 +67,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -100,7 +82,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100 -+++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100 -@@ -44,6 +44,11 @@ - endif - endif - endif -+ifeq ($(OS_TEST),amd64) -+ CSRCS += transform-sse2.c transform-sse1.c -+ SSE1_FLAGS=-msse -+ SSE2_FLAGS=-msse2 -+endif - - FORCE_STATIC_LIB = 1 - # This library is used by other shared libs Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 +++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -416,7 +416,7 @@ - # END enclude sources for V8 dtoa - ############################################# - --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 (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -793,7 +796,7 @@ endif # WINNT Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- mozilla/js/src/configure.in.orig 2012-01-29 15:44:24.000000000 +0100 +++ mozilla/js/src/configure.in 2012-01-30 23:37:46.541060008 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1432,7 +1432,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2713,6 +2713,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 @@ -2732,6 +2742,7 @@ AC_DEFINE(JS_NUNBOX32) ;; @@ -51,17 +16,6 @@ ;; esac -@@ -2795,6 +2807,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) @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 -@@ -74,6 +74,9 @@ - # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk - MODULE_OPTIMIZE_FLAGS=-O3 - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -129,6 +132,12 @@ - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # - # Neutrino/Intel (uses the same unixish_x86 code) - # -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -64,7 +64,9 @@ WRKSRC= ${WRKDIR}/comm-release MOZSRC:= ${WRKSRC}/mozilla -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/mail/thunderbird/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,42 +1,5 @@ --- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 +++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1430,7 +1430,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -1753,7 +1753,7 @@ - esac - - case "${host_cpu}" in -- x86_64) -+ amd64 | x86_64) - HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" - ;; - esac -@@ -2415,6 +2415,9 @@ - x86_64-*) - AC_DEFINE(_AMD64_) - ;; -+ amd64*) -+ AC_DEFINE(_AMD64_) -+ ;; - *) - AC_DEFINE(_CPU_ARCH_NOT_DEFINED) - ;; @@ -2486,7 +2489,7 @@ else DLL_SUFFIX=".so.1.0" Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-build-autoconf-config.sub Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 +++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -1517,7 +1517,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1539,7 +1539,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= @@ -58,7 +40,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -73,7 +55,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100 -+++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100 -@@ -44,6 +44,11 @@ - endif - endif - endif -+ifeq ($(OS_TEST),amd64) -+ CSRCS += transform-sse2.c transform-sse1.c -+ SSE1_FLAGS=-msse -+ SSE2_FLAGS=-msse2 -+endif - - FORCE_STATIC_LIB = 1 - # This library is used by other shared libs Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 +++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -418,6 +418,9 @@ - else - #CPPSRCS += only_on_x86.cpp - endif -+ifeq (amd64, $(TARGET_CPU)) -+#CPPSRCS += only_on_x86_64.cpp -+endif - endif - ifeq (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -737,7 +740,7 @@ endif # WINNT Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 +++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -1470,7 +1470,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1492,7 +1492,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2814,6 +2814,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 -@@ -74,6 +74,9 @@ - # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk - MODULE_OPTIMIZE_FLAGS=-O3 - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -129,6 +132,12 @@ - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # - # Neutrino/Intel (uses the same unixish_x86 code) - # -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird3/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -60,7 +60,9 @@ WRKSRC= ${WRKDIR}/comm-1.9.2 MOZSRC:= ${WRKSRC}/mozilla -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/mail/thunderbird3/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird3/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,14 +1,5 @@ --- configure.in.orig 2009-08-14 11:24:58.206076928 +0200 +++ configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac @@ -4304,6 +4304,9 @@ else NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' fi Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-configure.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ mozilla/configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,14 +1,5 @@ --- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 +++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 -@@ -1218,7 +1218,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac @@ -2466,10 +2466,6 @@ ENABLE_JIT=1 NANOJIT_ARCH=ARM Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -4,8 +4,8 @@ ifeq ($(CPU_ARCH),amd64) CPU_ARCH = x86_64 endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),powerpc64) +CPU_ARCH = powerpc Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,15 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-12-07 17:36:07.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-02-26 21:30:36.000000000 +0100 -@@ -73,6 +73,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -96,7 +99,7 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -85,7 +85,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,37 +18,20 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -115,6 +118,12 @@ - CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64 + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp endif # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# +-# FreeBSD/amd64 +-# +-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) +-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +-endif +-# # BeOS/Intel (uses the same unixish_x86 code) # ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -165,9 +174,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -322,7 +337,7 @@ +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -58,7 +40,7 @@ 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,7 +346,7 @@ +@@ -350,7 +365,7 @@ # # Linux/PPC64 # @@ -67,19 +49,12 @@ 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 -@@ -400,6 +415,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -60,7 +60,9 @@ WRKSRC:= ${WRKDIR}/mozilla-esr10 -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else @@ -83,6 +85,8 @@ USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" +MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET} +CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild .endif Modified: branches/experimental/www/firefox-esr/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- 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 - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -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) @@ -95,7 +77,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -110,7 +92,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/www/firefox-esr/files/patch-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Modified: branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- 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 (,$(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 (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -793,7 +796,7 @@ endif # WINNT Modified: branches/experimental/www/firefox-esr/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/files/patch-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 +++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1432,7 +1432,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2713,6 +2713,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 @@ -2732,6 +2742,7 @@ AC_DEFINE(JS_NUNBOX32) ;; @@ -51,17 +16,6 @@ ;; esac -@@ -2795,6 +2807,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) @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -94,6 +94,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -130,6 +133,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # Neutrino/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_TARGET),NTO) -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -75,7 +75,9 @@ MOZ_EXPORT+= MOZ_JEMALLOC=1 .endif -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else @@ -106,6 +108,8 @@ USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" +MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET} +CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild .endif Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- 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 - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -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 - @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= @@ -58,7 +40,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -73,7 +55,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 +++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -358,7 +358,7 @@ CPPSRCS += ExecutableAllocatorOS2.cpp \ - $(NONE) - endif - --ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifneq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - ENABLE_YARR_JIT = 1 - - VPATH += $(srcdir)/assembler/assembler \ -@@ -418,6 +418,9 @@ - else - #CPPSRCS += only_on_x86.cpp - endif -+ifeq (amd64, $(TARGET_CPU)) -+#CPPSRCS += only_on_x86_64.cpp -+endif - endif - ifeq (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -737,7 +740,7 @@ endif # WINNT Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,31 +1,5 @@ --- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 +++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -1470,7 +1470,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1492,7 +1492,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2798,6 +2798,6 @@ i?86-*) - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; --x86_64*-*) -+amd64*-*|x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -9,46 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -83,6 +83,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # Neutrino/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_TARGET),NTO) -@@ -94,6 +94,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -60,7 +60,9 @@ WRKSRC:= ${WRKDIR}/mozilla-release -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else @@ -83,6 +85,8 @@ USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" +MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET} +CONFIGURE_TARGET= # .mozconfig MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild .endif Modified: branches/experimental/www/firefox/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- configure.in.orig 2012-05-23 20:56:34.000000000 +0200 +++ configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -1517,7 +1517,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1539,7 +1539,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - @@ -4218,6 +4218,9 @@ else NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' fi @@ -68,7 +50,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -83,7 +65,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/www/firefox/files/patch-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Modified: branches/experimental/www/firefox/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/files/patch-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 +++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -418,6 +418,9 @@ - else - #CPPSRCS += only_on_x86.cpp - endif -+ifeq (amd64, $(TARGET_CPU)) -+#CPPSRCS += only_on_x86_64.cpp -+endif - endif - ifeq (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -737,7 +740,7 @@ endif # WINNT Modified: branches/experimental/www/firefox/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/files/patch-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 +++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -1470,7 +1470,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1492,7 +1492,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2814,6 +2814,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -94,6 +94,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -130,6 +133,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # Neutrino/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_TARGET),NTO) -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox36/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -56,7 +56,9 @@ EXTRA_PATCHES= ${FILESDIR}/libsydney_oss -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/www/firefox36/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox36/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,14 +1,5 @@ --- configure.in.orig 2009-10-03 20:24:11.000000000 +0200 +++ configure.in 2009-10-03 20:24:43.000000000 +0200 -@@ -1352,7 +1352,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - @@ -4252,6 +4252,9 @@ else NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' fi Modified: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,15 @@ ---- 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 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -96,7 +99,7 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -85,7 +85,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,35 +18,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 +@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64 + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp + endif # +-# FreeBSD/amd64 +-# -ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) -CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # +-endif +-# # BeOS/Intel (uses the same unixish_x86 code) -@@ -165,9 +168,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif # -@@ -322,7 +331,7 @@ + ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -56,32 +40,21 @@ 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 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/kompozer/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -21,6 +21,7 @@ USE_BZIP2= yes USE_GECKO= gecko USE_GMAKE= yes +GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/mozilla MAKEFILE= client.mk ALL_TARGET= build_all @@ -44,6 +45,10 @@ .include <bsd.port.pre.mk> +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.endif + post-patch: @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in Modified: branches/experimental/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,15 +1,14 @@ --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-05-02 18:43:37.000000000 +0200 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-09-28 22:05:47.000000000 +0200 -@@ -66,6 +66,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif +@@ -77,7 +77,7 @@ endif + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing # - # OpenBSD/amd64 +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp @@ -88,7 +91,7 @@ endif endif @@ -19,51 +18,21 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -151,9 +154,15 @@ - CPPSRCS := xptcinvoke_openbsd_alpha.cpp xptcstubs_openbsd_alpha.cpp - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha +@@ -295,7 +295,7 @@ endif # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -293,6 +302,14 @@ - endif - - # -+# FreeBSD/PPC -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDpowerpc) -+CPPSRCS := xptcinvoke_ppc_freebsd.cpp xptcstubs_ppc_freebsd.cpp -+ASFILES := xptcinvoke_asm_ppc_freebsd.s xptcstubs_asm_ppc_freebsd.s -+endif -+ -+# # Linux/PPC # - ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) -@@ -364,6 +381,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) ++ifneq (,$(filter Linuxppc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + 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 +@@ -400,7 +400,7 @@ endif + # + # OpenBSD/SPARC64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparcv9_solaris.s endif - # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif -+endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) Deleted: branches/experimental/www/kompozer/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/www/kompozer/files/patch-xptcall-alpha Sat Jun 30 22:55:47 2012 (r821) +++ /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/kompozer/files/patch-xptcall-ia64 ============================================================================== --- branches/experimental/www/kompozer/files/patch-xptcall-ia64 Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-05-02 18:43:37.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-31 15:05:05.000000000 +0200 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments Deleted: branches/experimental/www/kompozer/files/patch-xptcall-powerpc ============================================================================== --- branches/experimental/www/kompozer/files/patch-xptcall-powerpc Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,584 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp.orig 2009-09-28 22:06:31.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp 2009-09-28 22:06:31.000000000 +0200 -@@ -0,0 +1,232 @@ -+/* -*- 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" -+ -+// 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; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->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->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ 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" ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s.orig 2009-09-28 22:06:31.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s 2009-09-28 22:06:31.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/xptcinvoke_ppc_freebsd.cpp.orig 2009-09-28 22:06:31.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp 2009-09-28 22:06:31.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 XPTC_InvokeByIndex() is to map a platform -+// indepenpent call to the platform ABI. To do that, -+// XPTC_InvokeByIndex() 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" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s.orig 2009-09-28 22:06:31.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s 2009-09-28 22:06:31.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 XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex,@function -+ -+# -+# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+# PRUint32 paramCount, nsXPTCVariant* params) -+# -+ -+XPTC_InvokeByIndex: -+ 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 Deleted: branches/experimental/www/kompozer/files/patch-xptcall-sparc64 ============================================================================== --- branches/experimental/www/kompozer/files/patch-xptcall-sparc64 Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- 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" -+ -+#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; -+ 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"); -+ -+ 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->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ 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__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -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 XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ 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 XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -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; -+} Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -59,7 +59,9 @@ MOZ_PKGCONFIG_FILES+= mozilla-nss .endif -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/www/libxul/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- 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 - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -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) @@ -95,7 +77,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -110,7 +92,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/libxul/files/patch-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Modified: branches/experimental/www/libxul/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/libxul/files/patch-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/files/patch-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- 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 (,$(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 (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -793,7 +796,7 @@ endif # WINNT Modified: branches/experimental/www/libxul/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/libxul/files/patch-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/files/patch-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 +++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1432,7 +1432,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2713,6 +2713,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 @@ -2732,6 +2742,7 @@ AC_DEFINE(JS_NUNBOX32) ;; @@ -51,17 +16,6 @@ ;; esac -@@ -2795,6 +2807,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) @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 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 Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ ---- 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 -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -130,6 +133,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # Neutrino/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_TARGET),NTO) -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul19/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -64,7 +64,9 @@ EXTRA_PATCHES= ${FILESDIR}/libsydney_oss .endif -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/www/libxul19/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul19/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul19/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,14 +1,5 @@ --- 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 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - @@ -4252,6 +4252,9 @@ else NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' fi Modified: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,15 @@ ---- 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 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -96,7 +99,7 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -85,7 +85,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,35 +18,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 +@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64 + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp + endif # +-# FreeBSD/amd64 +-# -ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) -CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # +-endif +-# # BeOS/Intel (uses the same unixish_x86 code) -@@ -165,9 +168,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif # -@@ -322,7 +331,7 @@ + ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -56,32 +40,21 @@ 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 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Deleted: branches/experimental/www/libxul19/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/www/libxul19/files/patch-xptcall-alpha Sat Jun 30 22:55:47 2012 (r821) +++ /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/libxul19/files/patch-xptcall-amd64 ============================================================================== --- branches/experimental/www/libxul19/files/patch-xptcall-amd64 Sat Jun 30 22:55:47 2012 (r821) +++ /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/libxul19/files/patch-xptcall-powerpc ============================================================================== --- branches/experimental/www/libxul19/files/patch-xptcall-powerpc Sat Jun 30 22:55:47 2012 (r821) +++ /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/libxul19/files/patch-xptcall-sparc64 ============================================================================== --- branches/experimental/www/libxul19/files/patch-xptcall-sparc64 Sat Jun 30 22:55:47 2012 (r821) +++ /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; -+} Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 30 22:55:47 2012 (r822) @@ -65,7 +65,9 @@ MOZSRC:= ${WRKDIR}/comm-release/mozilla WRKSRC= ${WRKDIR}/comm-release -.if ${ARCH} == powerpc64 +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.elif ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build .else Modified: branches/experimental/www/seamonkey/files/patch-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,42 +1,5 @@ --- configure.in.orig 2011-12-17 18:35:47.000000000 +0100 +++ configure.in 2011-12-19 15:57:09.000000000 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1430,7 +1430,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -1753,7 +1753,7 @@ - esac - - case "${host_cpu}" in -- x86_64) -+ amd64 | x86_64) - HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" - ;; - esac -@@ -2415,6 +2415,9 @@ - x86_64-*) - AC_DEFINE(_AMD64_) - ;; -+ amd64*) -+ AC_DEFINE(_AMD64_) -+ ;; - *) - AC_DEFINE(_CPU_ARCH_NOT_DEFINED) - ;; @@ -2486,7 +2489,7 @@ else DLL_SUFFIX=".so.1.0" Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,23 +1,5 @@ --- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 +++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -1517,7 +1517,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1539,7 +1539,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= @@ -58,7 +40,7 @@ + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; @@ -73,7 +55,7 @@ + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 + ;; -+ FreeBSD:amd64) ++ FreeBSD:x86_64) + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 -+++ mozilla/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) Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,24 +1,5 @@ --- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 +++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -418,6 +418,9 @@ - else - #CPPSRCS += only_on_x86.cpp - endif -+ifeq (amd64, $(TARGET_CPU)) -+#CPPSRCS += only_on_x86_64.cpp -+endif - endif - ifeq (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp @@ -737,7 +740,7 @@ endif # WINNT Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 -+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,40 +1,5 @@ --- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 +++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -1470,7 +1470,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1492,7 +1492,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2814,6 +2814,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before <stdint.h> is included. */ Modified: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Sat Jun 30 22:55:47 2012 (r822) @@ -9,8 +9,8 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 Modified: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:23 2012 (r821) +++ branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jun 30 22:55:47 2012 (r822) @@ -1,16 +1,6 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 -@@ -74,6 +74,9 @@ - # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk - MODULE_OPTIMIZE_FLAGS=-O3 - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 +@@ -70,7 +70,7 @@ endif endif # IA64 Linux @@ -19,36 +9,6 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -129,6 +132,12 @@ - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # - # Neutrino/Intel (uses the same unixish_x86 code) - # -@@ -184,9 +193,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # @@ -341,7 +356,7 @@ # # Linux/PPC @@ -67,19 +27,12 @@ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -419,6 +434,15 @@ - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s - endif +@@ -350,7 +350,7 @@ # -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s -+endif -+endif -+# - # OpenBSD/SPARC + # OpenBSD/SPARC64 # - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) ++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp + ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s + endif Deleted: branches/experimental/www/seamonkey/files/patch-xptcall-amd64 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-amd64 Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -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" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(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; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.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; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->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->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ 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/seamonkey/files/patch-xptcall-ia64 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-ia64 Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s 2009-08-26 18:49:39.000000000 +0200 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'NS_InvokeByIndex_P' -+ .global XPTC_InvokeByIndex - .proc NS_InvokeByIndex_P - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --NS_InvokeByIndex_P:: -+NS_InvokeByIndex_P: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-26 18:47:34.000000000 +0200 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments Deleted: branches/experimental/www/seamonkey/files/patch-xptcall-sparc64 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-sparc64 Sat Jun 30 22:55:47 2012 (r821) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- 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" -+ -+#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; -+ 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"); -+ -+ 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->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ 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__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -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 XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ 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 XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -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; -+}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206302255.q5UMtlGb051595>