Make this work on powerpc.

12 files changed, 228 insertions, 20 deletions

diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index c19725bce74..9573ee7c326 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/23 19:48:19 jtb Exp $
 #
 
 DISTNAME=		gprolog-1.2.16
@@ -10,7 +10,7 @@ MAINTAINER=		brook@nmsu.edu
 HOMEPAGE=		http://gnu-prolog.inria.fr/
 COMMENT=		GNU prolog compiler and interpreter
 
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc
+ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/${PKGNAME} \
diff --git a/lang/gprolog/distinfo b/lang/gprolog/distinfo
index 89f478c27d5..9e1990b791a 100644
--- a/lang/gprolog/distinfo
+++ b/lang/gprolog/distinfo
@@ -1,8 +1,16 @@
-$NetBSD: distinfo,v 1.3 2002/11/13 20:15:11 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2003/06/23 19:48:19 jtb Exp $
 
 SHA1 (gprolog-1.2.16.tar.gz) = 128071ff640be38782b943218762e09ef0287dc6
 Size (gprolog-1.2.16.tar.gz) = 2478633 bytes
 SHA1 (patch-aa) = 11cef0fd91bcfa21c264f5d2f44d1a06c6075177
-SHA1 (patch-ae) = 76b3303531f950a57145c4b713559e3fbb98ef10
+SHA1 (patch-ab) = 34d13265085198d4ccbc0bcd9c1d33e02fc5090f
+SHA1 (patch-ac) = 46c8eda2f3128deea650a1967208d3d79589c051
+SHA1 (patch-ad) = 3a83cf6a9ab48830237ee8ac5d162ac5260775bc
+SHA1 (patch-ae) = fbee8e3314e1a1f34019ce5f4721b54ad7e1acf4
+SHA1 (patch-af) = 73b0fa41a4502e7094daac1afa920e009227585f
+SHA1 (patch-ag) = 6899456ea20d3830c1ef8722143cfb8e53596992
+SHA1 (patch-ah) = 36647d4498942748489c7547e2d1582ad9d3b9a2
+SHA1 (patch-ai) = 00a69fc3254a2bc4635c500d70ca787ac93fac33
 SHA1 (patch-al) = 5745b485e5cfc82142148f49ab69f307fe7b71cf
-SHA1 (patch-an) = 83ad8ca1db7188bca13f1df031ac37399c35f004
+SHA1 (patch-am) = 6c12d78cbf6d2763ad7bf0f40cee2025f2362961
+SHA1 (patch-an) = de2f07898aeffab6780a7ae8a227a82c2c45483c
diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab
new file mode 100644
index 00000000000..80516de495c
--- /dev/null
+++ b/lang/gprolog/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2003/06/23 19:48:20 jtb Exp $
+
+--- configure.in.orig
++++ configure.in
+@@ -319,6 +319,7 @@
+ 		i*86*bsd*)       AC_DEFINE(M_ix86_bsd);;
+         	powerpc*linux*)  AC_DEFINE(M_powerpc_linux);;
+ 		powerpc*darwin*) AC_DEFINE(M_powerpc_darwin);;
++		powerpc*bsd*)    AC_DEFINE(M_powerpc_bsd);;
+ 		*86*cygwin*)     AC_DEFINE(M_ix86_cygwin);;
+ 		*)               AC_MSG_ERROR(unsupported architecture)
+ 	esac
diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac
new file mode 100644
index 00000000000..4a73b019931
--- /dev/null
+++ b/lang/gprolog/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2003/06/23 19:48:21 jtb Exp $
+
+--- configure.orig
++++ configure
+@@ -2359,6 +2359,10 @@
+ #define M_powerpc_darwin 1
+ EOF
+ ;;
++		powerpc*bsd*) cat >>confdefs.h <<\EOF
++#define M_powerpc_bsd 1
++EOF
++;;
+ 		*86*cygwin*)     cat >>confdefs.h <<\EOF
+ #define M_ix86_cygwin 1
+ EOF
diff --git a/lang/gprolog/patches/patch-ad b/lang/gprolog/patches/patch-ad
new file mode 100644
index 00000000000..d97772f9a50
--- /dev/null
+++ b/lang/gprolog/patches/patch-ad
@@ -0,0 +1,76 @@
+$NetBSD: patch-ad,v 1.3 2003/06/23 19:48:22 jtb Exp $
+
+--- Ma2Asm/powerpc_any.c.orig
++++ Ma2Asm/powerpc_any.c
+@@ -42,7 +42,7 @@
+ #define MAX_DOUBLES_IN_PRED        2048
+ 
+ 
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 
+ #define UN
+ #define R(reg)                     #reg
+@@ -186,7 +186,7 @@
+ 
+   Label_Printf("");
+   Inst_Printf(".align", "2");
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+   Inst_Printf(".type", "%s,@function", label);
+ #endif
+ 
+@@ -431,7 +431,7 @@
+ 
+ 
+ 
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 
+ #define STACK_OFFSET(offset)   offset * 4 - 24
+ #define DBL_RET_WORDS          0
+@@ -462,7 +462,7 @@
+ }
+ 
+ 
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 
+ #define AFTER_ARG_DBL						\
+ }
+@@ -649,7 +649,7 @@
+   BEFORE_ARG;
+ 
+   Inst_Printf("addis", "%s,0," HI_UN(foreign_double+%d), r,
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 	      index * 4
+ #else
+ 	      index * 8
+@@ -882,7 +882,7 @@
+ void
+ Dico_String_Start(int nb_consts)
+ {
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+   Label_Printf(".section\t.rodata");
+ #else
+   Label_Printf(".cstring");
+@@ -900,7 +900,7 @@
+ Dico_String(int str_no, char *asciiz)
+ {
+   Label_Printf("%s%d:", STRING_PREFIX, str_no);
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+   Inst_Printf(".string", "%s", asciiz);
+ #else
+   Inst_Printf(".asciz", "%s", asciiz);
+@@ -948,7 +948,7 @@
+     case NONE:
+       value = 1;		/* then in case ARRAY_SIZE */
+     case ARRAY_SIZE:
+-#ifdef M_powerpc_linux
++#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+       if (!global)
+ 	Inst_Printf(".local", UN "%s", name);
+       Inst_Printf(".comm", UN "%s,%ld,4", name, value * 4);
diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae
index 3128a684f24..2ffee6f6120 100644
--- a/lang/gprolog/patches/patch-ae
+++ b/lang/gprolog/patches/patch-ae
@@ -1,16 +1,30 @@
-$NetBSD: patch-ae,v 1.2 2002/11/13 20:15:12 jschauma Exp $
+$NetBSD: patch-ae,v 1.3 2003/06/23 19:48:22 jtb Exp $
 
---- EnginePl/gp_config.h.orig	Wed Nov 13 13:35:46 2002
-+++ EnginePl/gp_config.h	Wed Nov 13 13:36:56 2002
-@@ -30,7 +30,10 @@
- /* #undef HAVE_SYS_IOCTL_COMPAT_H */
- 
+--- EnginePl/gp_config.h.in.orig
++++ EnginePl/gp_config.h.in
+@@ -31,7 +31,10 @@
  /* Define if you have termios.h */
--#define HAVE_TERMIOS_H 1
-+#undef HAVE_TERMIOS_H
-+
+ #undef HAVE_TERMIOS_H
+ 
+-/* Define if you have termios.h */
 +/* Define if you have termio.h */
 +#undef HAVE_TERMIO_H
++
++/* Define if you have malloc.h */
+ #undef HAVE_MALLOC_H
  
- /* Define if you have termios.h */
- #define HAVE_MALLOC_H 1
+ /* Define if you have a working `mmap' system call */
+@@ -151,9 +154,12 @@
+ /* Define if the system is a powerpc/linux */
+ #undef M_powerpc_linux
+ 
+-/* Define if the system is a powerpc/bsd */
++/* Define if the system is a powerpc/darwin */
+ #undef M_powerpc_darwin
+ 
++/* Define if the system is a powerpc/bsd */
++#undef M_powerpc_bsd
++
+ 
+ 
+ /* Constant definitions */
diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af
new file mode 100644
index 00000000000..dd9eb9051bd
--- /dev/null
+++ b/lang/gprolog/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2003/06/23 19:48:22 jtb Exp $
+
+--- EnginePl/engine1.c.orig
++++ EnginePl/engine1.c
+@@ -78,7 +78,7 @@
+   register WamWord *rb asm("$9") = reg_bank;
+   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
+ 
+-#elif defined(M_powerpc_linux)
++#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 
+   register WamWord *rb asm("15") = reg_bank;
+   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
diff --git a/lang/gprolog/patches/patch-ag b/lang/gprolog/patches/patch-ag
new file mode 100644
index 00000000000..f51d67584b1
--- /dev/null
+++ b/lang/gprolog/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2003/06/23 19:48:22 jtb Exp $
+
+--- BipsPl/os_interf_c.c.orig
++++ BipsPl/os_interf_c.c
+@@ -217,7 +217,7 @@
+   tsig[nb_sig].atom = Create_Atom("SIGIO");
+   tsig[nb_sig++].sig = SIGIO;
+ #endif
+-#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin )
++#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin ) && !defined( M_powerpc_bsd )
+   tsig[nb_sig].atom = Create_Atom("SIGPOLL");
+   tsig[nb_sig++].sig = SIGPOLL;
+ #endif
diff --git a/lang/gprolog/patches/patch-ah b/lang/gprolog/patches/patch-ah
new file mode 100644
index 00000000000..c22c9abaaa3
--- /dev/null
+++ b/lang/gprolog/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2003/06/23 19:48:23 jtb Exp $
+
+--- EnginePl/gprolog.h.orig
++++ EnginePl/gprolog.h
+@@ -686,7 +686,7 @@
+ #else
+ #    define M_USED_REGS            {"ebx", "ebp", 0}
+ #endif
+-#elif defined(M_powerpc_linux)
++#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ #    define M_USED_REGS            {"15", "20", 0}
+ #elif defined(M_powerpc_darwin)
+ #    define M_USED_REGS            {"15", "20", 0}
diff --git a/lang/gprolog/patches/patch-ai b/lang/gprolog/patches/patch-ai
new file mode 100644
index 00000000000..7b661a01778
--- /dev/null
+++ b/lang/gprolog/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.3 2003/06/23 19:48:24 jtb Exp $
+
+--- EnginePl/machine.c.orig
++++ EnginePl/machine.c
+@@ -480,7 +480,7 @@
+ 
+ static void
+ SIGSEGV_Handler(int sig, siginfo_t * si)
+-#elif defined(M_ix86_bsd)
++#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd)
+ 
+ static void
+ SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
+@@ -528,7 +528,7 @@
+ 
+   WamWord *addr = (WamWord *) si->si_addr;
+ 
+-#elif defined(M_ix86_bsd)
++#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd)
+ 
+   WamWord *addr = (WamWord *) scp->sc_err;
+ 
diff --git a/lang/gprolog/patches/patch-am b/lang/gprolog/patches/patch-am
new file mode 100644
index 00000000000..cbed97d9442
--- /dev/null
+++ b/lang/gprolog/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2003/06/23 19:48:24 jtb Exp $
+
+--- EnginePl/obj_chain.c.orig
++++ EnginePl/obj_chain.c
+@@ -207,7 +207,7 @@
+ #endif
+       (*p->fct_init) ();
+ 
+-#if defined(M_powerpc_linux) || defined(M_alpha_linux) || \
++#if defined(M_powerpc_linux) || defined(M_alpha_linux) || defined(M_powerpc_bsd) ||\
+     defined(M_mips_irix)
+       p = (ObjChain *) ((long *) p + 1);
+ #elif 0
diff --git a/lang/gprolog/patches/patch-an b/lang/gprolog/patches/patch-an
index 694602de0e0..dc231411a2e 100644
--- a/lang/gprolog/patches/patch-an
+++ b/lang/gprolog/patches/patch-an
@@ -1,14 +1,23 @@
-$NetBSD: patch-an,v 1.2 2002/11/13 20:15:14 jschauma Exp $
+$NetBSD: patch-an,v 1.3 2003/06/23 19:48:25 jtb Exp $
 
---- Ma2Asm/FromC/mach.h.orig	Wed Nov 13 13:46:19 2002
-+++ Ma2Asm/FromC/mach.h	Wed Nov 13 13:47:00 2002
+--- Ma2Asm/FromC/mach.h.orig
++++ Ma2Asm/FromC/mach.h
 @@ -12,7 +12,8 @@
   *---------------------------------*/
  
  #if defined(M_sony_news) || defined(M_ultrix_dec) || defined(M_alpha_osf) ||\
 -    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd)
 +    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd) ||\
-+    defined(__ELF__)
++    defined(M_powerpc_bsd) || defined(__ELF__)
  
  #   define M_Asm_Symbol1(name)     #name
  #   define M_Asm_Symbol(name)      M_Asm_Symbol1(name)
+@@ -66,7 +67,7 @@
+ 
+ #    define M_Direct_Goto(lab)     {_asm {jmp M_Asm_Symbol(lab)}; return;}
+ 
+-#elif defined(M_powerpc_linux)
++#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ 
+ #    define M_Direct_Goto(lab)     {asm("b " M_Asm_Symbol(lab)); return;}
+