Make this compile, at least, on NetBSD/m68kelf, using patches submitted

to tech-pkg by Klaus Heinz.

5 files changed, 143 insertions, 21 deletions

diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 07439f83a73..de2c71fac19 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.24 2002/07/12 13:07:27 taya Exp $
+$NetBSD: distinfo,v 1.25 2002/08/19 22:57:02 fredb Exp $
 
 SHA1 (mozilla-source-1.0.tar.bz2) = 92d44f3196dca3182ffe64414fc0a574a5aa7416
 Size (mozilla-source-1.0.tar.bz2) = 29620700 bytes
 SHA1 (patch-aa) = f1bbdd178534d889091c19f042abb08566cdae30
 SHA1 (patch-ab) = a95161cdd0aaf8761dd36fd88dddd35ff588fcd0
+SHA1 (patch-ac) = d251ed948f5109a3d220e180a4c364dc551297d2
+SHA1 (patch-ad) = dbde69684db4fc198b262e77265c6404aa70754f
+SHA1 (patch-ae) = d46c963c51eba75e50c74d6e2b7d1e1b0e13b186
 SHA1 (patch-am) = f2579e2729d18335101ea46dc96fb7463c819ef3
 SHA1 (patch-aw) = d0e738f5ed84aaf390de56a6d741de0e8ee69d3a
 SHA1 (patch-ba) = b3dd4948fd735ac9d7d9b98a8a2619199c64a082
 SHA1 (patch-bb) = 5c6ebfa4a248d2b584ec801834daa16055de9971
-SHA1 (patch-bc) = cb1cb5b6e2010f561042e16e184abc5870f41c72
 SHA1 (patch-be) = 230639b8f5a2f9d228fbc1ac6fdb71c83bd5379b
 SHA1 (patch-bf) = 9d594a9eec7d396d93c8cee0b911c4c89a67a335
 SHA1 (patch-bh) = 2b2067c7306d5da3e924f99ea603092c22c3d035
diff --git a/www/mozilla/patches/patch-ac b/www/mozilla/patches/patch-ac
new file mode 100644
index 00000000000..bd40b119019
--- /dev/null
+++ b/www/mozilla/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.15 2002/08/19 22:57:03 fredb Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Tue Apr  9 22:37:34 2002
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -149,6 +149,14 @@
+ #
+ ifeq ($(OS_ARCH),NetBSD)
+ ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
++ifneq (,$(findstring elf,$(TARGET_OS)))
++# ELF format
++SYMBOLPREFIX=\"\"
++else 
++# aout format
++SYMBOLPREFIX=\"_\"
++endif
++CXXFLAGS        += -DSYMBOLPREFIX=$(SYMBOLPREFIX)
+ CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
+ endif
+ endif
+@@ -253,6 +261,13 @@
+ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
+ CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
++endif
++#   
++# NetBSD/SPARC64
++#   
++ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
++CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
++ASFILES                := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
+ endif
+ #
+ # Solaris/SPARC
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
new file mode 100644
index 00000000000..1addcec0ebc
--- /dev/null
+++ b/www/mozilla/patches/patch-ad
@@ -0,0 +1,70 @@
+$NetBSD: patch-ad,v 1.20 2002/08/19 22:57:03 fredb Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig   Sat Jul 20 19:41:33 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
+@@ -132,6 +132,10 @@
+     }
+ }
+ 
++/*
++ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
++ */
++
+ XPTC_PUBLIC_API(nsresult)
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                    PRUint32 paramCount, nsXPTCVariant* params)
+@@ -139,30 +143,30 @@
+     PRUint32 result;
+ 
+  __asm__ __volatile__(
+-    "movl  %4, sp@-\n\t"
+-    "movl  %3, sp@-\n\t"
+-    "jbsr  _invoke_count_words\n\t"     /* count words */
+-    "addql #8, sp\n\t"
+-    "lsll  #2, d0\n\t"      /* *= 4 */
+-    "movl  sp, a2\n\t"	    /* save original sp */
+-    "subl  d0, sp\n\t"      /* make room for params */
+-    "movl  sp, a0\n\t"
+-    "movl  %4, sp@-\n\t"
+-    "movl  %3, sp@-\n\t"
+-    "movl  a0, sp@-\n\t"
+-    "jbsr  _invoke_copy_to_stack\n\t"   /* copy params */
+-    "addl  #12, sp\n\t"
+-    "movl  %1, a0\n\t"
+-    "movl  a0@, a1\n\t"
+-    "movl  %2, d0\n\t"      /* function index */
+-    "movl  a0, d1\n\t"
+-    "movw  a1@(8,d0:l:8), a0\n\t"
+-    "addl  a0, d1\n\t"
+-    "movl  a1@(12,d0:l:8), a1\n\t"
+-    "movl  d1, sp@-\n\t"
+-    "jbsr  a1@\n\t"
+-    "movl  a2, sp\n\t"	    /* restore original sp */
+-    "movl  d0, %0\n\t"
++    "movl  %4, %%sp@-\n\t"
++    "movl  %3, %%sp@-\n\t"
++    "jbsr  "SYMBOLPREFIX"invoke_count_words\n\t"     /* count words */
++    "addql #8, %%sp\n\t"
++    "lsll  #2, %%d0\n\t"      /* *= 4 */
++    "movl  %%sp, %%a2\n\t"         /* save original sp */
++    "subl  %%d0, %%sp\n\t"      /* make room for params */
++    "movl  %%sp, %%a0\n\t"
++    "movl  %4, %%sp@-\n\t"
++    "movl  %3, %%sp@-\n\t"
++    "movl  %%a0, %%sp@-\n\t"
++    "jbsr  "SYMBOLPREFIX"invoke_copy_to_stack\n\t"   /* copy params */
++    "addl  #12, %%sp\n\t"
++    "movl  %1, %%a0\n\t"
++    "movl  %%a0@, %%a1\n\t"
++    "movl  %2, %%d0\n\t"      /* function index */
++    "movl  %%a0, %%d1\n\t"
++    "movw  %%a1@(8,%%d0:l:8), %%a0\n\t"
++    "addl  %%a0, %%d1\n\t"
++    "movl  %%a1@(12,%%d0:l:8), %%a1\n\t"
++    "movl  %%d1, %%sp@-\n\t"
++    "jbsr  %%a1@\n\t"
++    "movl  %%a2, %%sp\n\t"         /* restore original sp */
++    "movl  %%d0, %0\n\t"
+     : "=g" (result)         /* %0 */
+     : "g" (that),           /* %1 */
+       "g" (methodIndex),    /* %2 */
diff --git a/www/mozilla/patches/patch-ae b/www/mozilla/patches/patch-ae
new file mode 100644
index 00000000000..ce8e1ea9722
--- /dev/null
+++ b/www/mozilla/patches/patch-ae
@@ -0,0 +1,36 @@
+$NetBSD: patch-ae,v 1.11 2002/08/19 22:57:04 fredb Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	Wed Apr 10 05:37:42 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
+@@ -123,17 +123,22 @@
+     }
+ }
+ 
++/*
++ * Beware: use % instead of %% for register identifiers in a preprocessor macro
++ * SYMBOL PREFIX must be "_" for aout and "" for ELF 
++ */
++
+ #define STUB_ENTRY(n)							\
+ __asm__(								\
+-    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
+-"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
+-    "link  a6,#0			\n\t"				\
+-    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
+-    "movl  a0, sp@-			\n\t"				\
+-    "movl  #"#n", sp@-			\n\t"	/* method index */	\
+-    "movl  a6@(8), sp@-			\n\t"	/* this */		\
+-    "jbsr  _PrepareAndDispatch		\n\t"				\
+-    "unlk  a6				\n\t"				\
++    ".global   "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"           \
++SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"                          \
++    "link  %a6,#0                      \n\t"                           \
++    "lea   %a6@(12), %a0               \n\t"   /* pointer to args */   \
++    "movl  %a0, %sp@-                  \n\t"                           \
++    "movl  #"#n", %sp@-                        \n\t"   /* method index */      \
++    "movl  %a6@(8), %sp@-              \n\t"   /* this */              \
++    "jbsr  "SYMBOLPREFIX"PrepareAndDispatch\n\t"                       \
++    "unlk  %a6                         \n\t"                           \
+     "rts				\n\t"				\
+ );
+ 
diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc
deleted file mode 100644
index fc241c9011c..00000000000
--- a/www/mozilla/patches/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bc,v 1.9 2002/06/06 02:05:58 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Wed Apr 10 12:37:34 2002
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Jun  6 09:13:32 2002
-@@ -254,6 +254,13 @@
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
-+#   
-+# NetBSD/SPARC64
-+#   
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS		:= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
-+endif
- #
- # Solaris/SPARC
- #