Make this work on powerpc.

7 files changed, 117 insertions, 10 deletions

diff --git a/lang/smlnj/patches/patch-ab b/lang/smlnj/patches/patch-ab
new file mode 100644
index 00000000000..d099ec8b4b8
--- /dev/null
+++ b/lang/smlnj/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2003/07/01 23:10:34 jtb Exp $
+
+--- /dev/null
++++ src/runtime/objs/mk.ppc-netbsd
+@@ -0,0 +1,24 @@
++# mk.ppc-netbsd
++#
++
++SHELL		= /bin/sh
++
++MAKE =		gmake
++GCC =		gcc
++ARFLAGS =	Trcv
++CFLAGS =	@CFLAGS@
++LDFLAGS=
++CPP =		$(GCC) -x c -E -P
++
++#XOBJS =	xmonitor.o
++#LD_LIBS =	-lX11
++#BASE_DEFS =	-DHEAP_MONITOR -DPOLL_DEBUG
++XOBJS =
++XLIBS =
++DEFS =		$(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD
++TARGET =	PPC
++VERSION =	v-ppc-netbsd
++RUNTIME =	run.ppc-netbsd
++
++all:
++	($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
diff --git a/lang/smlnj/patches/patch-ac b/lang/smlnj/patches/patch-ac
index b47a06f6c49..2a1c70875fb 100644
--- a/lang/smlnj/patches/patch-ac
+++ b/lang/smlnj/patches/patch-ac
@@ -1,13 +1,19 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2003/07/01 23:10:34 jtb Exp $
 
---- config/_arch-n-opsys.orig        Fri Oct 20 18:02:25 2000
-+++ config/_arch-n-opsys     Fri Mar  9 14:07:05 2001
-@@ -107,6 +107,7 @@
+--- config/_arch-n-opsys.orig
++++ config/_arch-n-opsys
+@@ -106,11 +106,13 @@
+   NetBSD)
+     OPSYS=netbsd
+     HEAP_OPSYS=bsd
+-    case `uname -m` in
++    case `uname -p` in
+       i386) ARCH=x86;;
        i486) ARCH=x86;;
        i586) ARCH=x86;;
        i686) ARCH=x86;;
++      powerpc) ARCH=ppc;;
 +      sparc) ARCH=sparc;;
        *) exit 1;;
      esac
      ;;
-
diff --git a/lang/smlnj/patches/patch-ad b/lang/smlnj/patches/patch-ad
index 9c8962cdd9b..a1a4134b5b3 100644
--- a/lang/smlnj/patches/patch-ad
+++ b/lang/smlnj/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2003/07/01 23:10:34 jtb Exp $
 
---- src/runtime/include/asm-base.h.orig	Fri Apr 12 13:54:31 2002
+--- src/runtime/include/asm-base.h.orig
 +++ src/runtime/include/asm-base.h
 @@ -36,6 +36,11 @@
  #    define _ASM
@@ -14,3 +14,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
  #  endif
  #  define CGLOBAL(ID)	.global	CSYM(ID)
  #  define LABEL(ID)	ID:
+@@ -104,7 +109,7 @@
+ #    define DOUBLE(V)	.double V
+ #    define LABEL(ID)   ID:
+ 
+-#  elif (defined(OPSYS_LINUX) && defined(TARGET_PPC))
++#  elif ((defined(OPSYS_LINUX) || defined(OPSYS_NETBSD)) && defined(TARGET_PPC))
+ #    define CFUNSYM(ID)	ID
+ #    define CGLOBAL(ID)	.globl CSYM(ID)
+ #    define TEXT	.section ".text"
diff --git a/lang/smlnj/patches/patch-af b/lang/smlnj/patches/patch-af
index 0d4acbcc90f..a8097b18084 100644
--- a/lang/smlnj/patches/patch-af
+++ b/lang/smlnj/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
+$NetBSD: patch-af,v 1.2 2003/07/01 23:10:34 jtb Exp $
 
---- src/runtime/mach-dep/signal-sysdep.h.orig	Fri Apr 20 09:26:45 2001
+--- src/runtime/mach-dep/signal-sysdep.h.orig
 +++ src/runtime/mach-dep/signal-sysdep.h
-@@ -151,7 +151,7 @@ extern void SetFSR(int);
+@@ -147,7 +147,7 @@
    /* disable all FP exceptions */
  #  define SIG_InitFPE()    SetFSR(0)
  
@@ -11,3 +11,27 @@ $NetBSD: patch-af,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
      /** SPARC, SUNOS **/
  #    define USE_ZERO_LIMIT_PTR_FN
  #    define SIG_FAULT1		SIGFPE
+@@ -318,6 +318,23 @@
+ 
+ #    define SIG_Flags           0
+ 
++#  elif (defined(TARGET_PPC) && defined(OPSYS_NETBSD))
++    /* PPC, NetBSD */
++#    include <signal.h>
++     typedef struct sigcontext_t SigContext_t;
++
++#    define SIG_FAULT1          SIGTRAP
++
++#    define INT_DIVZERO(s, c)           ((s) == SIGTRAP)
++#    define INT_OVFLW(s, c)             ((s) == SIGTRAP)
++#    define SIG_GetPC(scp)              ((scp)->sc_frame.srr0)
++#    define SIG_SetPC(scp, addr)        { (scp)->sc_frame.srr0 = (long)(addr); }
++#    define SIG_ZeroLimitPtr(scp)       { ((scp)->sc_frame.fixreg[15] = 0); } /* limitptr = 15 (see src/runtime/mach-dep/PPC.prim.asm) */
++#    define SIG_GetCode(info,scp)       (info)
++     typedef void SigReturn_t;
++
++#    define SIG_Flags           0
++
+ 
+ #  endif /* HOST_RS6000/HOST_PPC */
+ 
diff --git a/lang/smlnj/patches/patch-ao b/lang/smlnj/patches/patch-ao
new file mode 100644
index 00000000000..ebc7150b79f
--- /dev/null
+++ b/lang/smlnj/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2003/07/01 23:10:34 jtb Exp $
+
+--- src/runtime/kernel/boot.c.orig
++++ src/runtime/kernel/boot.c
+@@ -124,7 +124,7 @@
+     ml_val_t	fileList;
+ # define SIZE_BUF_LEN	128	/* this should be plenty for two numbers */
+     char        sizeBuf[SIZE_BUF_LEN];
+-    char        c;
++    int        c;
+ 
+     numFiles = 0;
+ 
diff --git a/lang/smlnj/patches/patch-ap b/lang/smlnj/patches/patch-ap
new file mode 100644
index 00000000000..6c2a663fa9e
--- /dev/null
+++ b/lang/smlnj/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2003/07/01 23:10:34 jtb Exp $
+
+--- src/runtime/include/cache-flush.h.orig
++++ src/runtime/include/cache-flush.h
+@@ -40,7 +40,7 @@
+ extern FlushICache (void *addr, int nbytes);
+ 
+ 
+-#elif (defined(TARGET_PPC) && (defined(OPSYS_LINUX) || defined(OPSYS_DARWIN) ))
++#elif (defined(TARGET_PPC) && (defined(OPSYS_LINUX) || defined(OPSYS_DARWIN) || defined(OPSYS_NETBSD)))
+ extern FlushICache (void *addr, int nbytes);
+ 
+ #else
diff --git a/lang/smlnj/patches/patch-aq b/lang/smlnj/patches/patch-aq
new file mode 100644
index 00000000000..470d5319a51
--- /dev/null
+++ b/lang/smlnj/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2003/07/01 23:10:34 jtb Exp $
+
+--- src/runtime/mach-dep/PPC.prim.asm.orig
++++ src/runtime/mach-dep/PPC.prim.asm
+@@ -813,7 +813,7 @@
+ 	lfd	f31, 136(r3)
+ 	blr
+ 
+-#if (defined(TARGET_PPC) && (defined(OPSYS_LINUX) || defined(OPSYS_DARWIN) ))
++#if (defined(TARGET_PPC) && (defined(OPSYS_LINUX) || defined(OPSYS_DARWIN) || defined(OPSYS_NETBSD) ))
+ 
+ #define CACHE_LINE_SZB		32
+ #define CACHE_LINE_MASK		(CACHE_LINE_SZB-1)