- Split Makefile to Makefile & Makefile.common

- Use __ELF__ to detect ELF
- Modify xpcom stuff for arm like m68k

4 files changed, 65 insertions, 20 deletions

diff --git a/www/mozilla/patches/patch-ac b/www/mozilla/patches/patch-ac
index ec07eb28802..70651115fd5 100644
--- a/www/mozilla/patches/patch-ac
+++ b/www/mozilla/patches/patch-ac
@@ -1,24 +1,27 @@
-$NetBSD: patch-ac,v 1.16 2002/08/29 15:11:14 taya Exp $
+$NetBSD: patch-ac,v 1.17 2002/10/03 15:54:00 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 Jul 17 08:05:10 2002
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Wed Aug 28 11:21:45 2002
-@@ -159,6 +159,14 @@
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Sep  8 22:17:41 2002
+@@ -129,7 +129,7 @@
+ # NetBSD/ARM
  #
  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)
+-ifneq (,$(filter arm% sa110,$(OS_TEST)))
++ifneq (,$(filter arm%,$(TARGET_CPU)))
+ CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
+ endif
+ endif
+@@ -158,7 +158,7 @@
+ # NetBSD/m68k
+ #
+ ifeq ($(OS_ARCH),NetBSD)
+-ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
++ifneq (,$(filter m68k,$(TARGET_CPU)))
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -267,6 +275,13 @@
+@@ -267,6 +267,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
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
index c2366c97942..2146ee0bb90 100644
--- a/www/mozilla/patches/patch-ad
+++ b/www/mozilla/patches/patch-ad
@@ -1,20 +1,25 @@
-$NetBSD: patch-ad,v 1.21 2002/08/29 15:11:14 taya Exp $
+$NetBSD: patch-ad,v 1.22 2002/10/03 15:54:00 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Sat Sep 29 05:12:51 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Wed Aug 28 11:21:47 2002
-@@ -132,6 +132,10 @@
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Sun Sep  8 00:46:20 2002
+@@ -132,6 +132,15 @@
      }
  }
  
 +/*
 + * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
 + */
++#ifndef __ELF__
++#define	SYMBOLPREFIX	"_"
++#else
++#define	SYMBOLPREFIX
++#endif
 +
  XPTC_PUBLIC_API(nsresult)
  XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +143,30 @@
+@@ -139,30 +148,30 @@
      PRUint32 result;
  
   __asm__ __volatile__(
diff --git a/www/mozilla/patches/patch-ae b/www/mozilla/patches/patch-ae
index b29f1ce82f3..975b89fba90 100644
--- a/www/mozilla/patches/patch-ae
+++ b/www/mozilla/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.12 2002/08/29 15:11:14 taya Exp $
+$NetBSD: patch-ae,v 1.13 2002/10/03 15:54:00 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Sat Sep 29 05:12:52 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Wed Aug 28 11:21:52 2002
-@@ -123,17 +123,22 @@
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Sun Sep  8 00:46:37 2002
+@@ -123,17 +123,27 @@
      }
  }
  
@@ -11,6 +11,11 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k
 + * Beware: use % instead of %% for register identifiers in a preprocessor macro
 + * SYMBOL PREFIX must be "_" for aout and "" for ELF 
 + */
++#ifndef	__ELF__
++#define	SYMBOLPREFIX	"_"
++#else
++#define	SYMBOLPREFIX
++#endif
 +
  #define STUB_ENTRY(n)							\
  __asm__(								\
diff --git a/www/mozilla/patches/patch-bm b/www/mozilla/patches/patch-bm
new file mode 100644
index 00000000000..8a32fb360d5
--- /dev/null
+++ b/www/mozilla/patches/patch-bm
@@ -0,0 +1,32 @@
+$NetBSD: patch-bm,v 1.1 2002/10/03 15:54:01 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	Sat Sep 29 05:12:52 2001
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	Sun Sep  8 00:45:55 2002
+@@ -118,18 +118,23 @@
+  * so they are contiguous with values passed on the stack, and then calls
+  * PrepareAndDispatch() to do the dirty work.
+  */
++#ifndef	__ELF__
++#define	SYMBOLPREFIX	"_"
++#else
++#define	SYMBOLPREFIX
++#endif
+ 
+ #define STUB_ENTRY(n)							\
+ __asm__(								\
+-    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
+-"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
++    ".global	"SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"		\
++SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"				\
+     "stmfd	sp!, {r1, r2, r3}	\n\t"				\
+     "mov	ip, sp			\n\t"				\
+     "stmfd	sp!, {fp, ip, lr, pc}	\n\t"				\
+     "sub	fp, ip, #4		\n\t"				\
+     "mov	r1, #"#n"		\n\t"    /* = methodIndex 	*/ \
+     "add	r2, sp, #16		\n\t"				\
+-    "bl		_PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
++    "bl		"SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
+     "ldmea	fp, {fp, sp, lr}	\n\t"				\
+     "add	sp, sp, #12		\n\t"				\
+     "mov	pc, lr			\n\t"				\