Add support for NetBSD/sparc64.

10 files changed, 232 insertions, 13 deletions

diff --git a/editors/emacs/files/patch-sum b/editors/emacs/files/patch-sum
index bda50ad877b..1d94a1ad1d2 100644
--- a/editors/emacs/files/patch-sum
+++ b/editors/emacs/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.15 2000/09/08 16:56:58 itojun Exp $
+$NetBSD: patch-sum,v 1.16 2000/09/26 21:42:30 eeh Exp $
 
 MD5 (patch-aa) = 41d31356a0b856d789ded3ef10bb4349
-MD5 (patch-ab) = ef7e12a958af844399e841d2205995d7
+MD5 (patch-ab) = 25db9b5e7613517d2064749f50f61b27
 MD5 (patch-ad) = 66aac70c544f3877460851ffe37510ff
 MD5 (patch-ae) = f1718f253dabb4b1b9be6d2839353c5e
 MD5 (patch-af) = 139ec0b39a8bad5ab5cdc2c3785a59de
@@ -12,7 +12,13 @@ MD5 (patch-aj) = 2f1e748154c00130ff26c1b29c2f0c5b
 MD5 (patch-ak) = ef7fabe3fea75d799d8628d155a8b72c
 MD5 (patch-ax) = 46750ed00d5bff9fea4f330b0ca0fc41
 MD5 (patch-ay) = 39327beca758ac8d2cd9eab329beb5e6
-MD5 (patch-az) = 7e8f5f624f222c4eb16ca23901a0ebcb
+MD5 (patch-az) = 8a8e95e453328799b9f41dcf7925d08f
 MD5 (patch-bc) = f38d4bc4159920c81cb7d5f3770ace48
 MD5 (patch-bf) = 5af3c12a104c1b6caa0a95ffac9f56a3
-MD5 (patch-bg) = bd6546815c9b9e4389669e599acf90f0
+MD5 (patch-bg) = f57dba34c3267ecb3682da5b7bd0d014
+MD5 (patch-bh) = bf7bd756ef761d58f540fd529c73fef1
+MD5 (patch-bi) = d7201610f3fac29079ff81214dad990e
+MD5 (patch-bj) = 7de2586e0d3f3504a72e4ae9ed3ff1da
+MD5 (patch-bk) = 72d7dc923ea58a229b8aa98d8756807d
+MD5 (patch-bl) = 81c632d6e5777e7d0a7937cb8ca985bf
+MD5 (patch-bm) = fb85b1820ce2db2929ccbaa3d43b2759
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index f5d3b9fbc61..f97cd3c951f 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.11 2000/06/24 17:03:38 minoura Exp $
+$NetBSD: patch-ab,v 1.12 2000/09/26 21:42:34 eeh Exp $
 
---- configure.orig	Tue Jun 13 05:05:56 2000
-+++ configure	Sun Jun 18 09:18:13 2000
+--- configure.orig	Mon Jun 12 13:05:56 2000
++++ configure	Tue Sep 26 14:18:05 2000
 @@ -21,6 +21,9 @@
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
  ac_help="$ac_help
@@ -18,8 +18,9 @@ $NetBSD: patch-ab,v 1.11 2000/06/24 17:03:38 minoura Exp $
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
        ns32k-*-netbsd*)	machine=ns32000 ;;
+-      sparc-*-netbsd*)	machine=sparc ;;
 +      powerpc-*-netbsd*) machine=macppc ;;
-       sparc-*-netbsd*)	machine=sparc ;;
++      sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
      esac
diff --git a/editors/emacs/patches/patch-az b/editors/emacs/patches/patch-az
index ccfffafa25c..c181826c7bd 100644
--- a/editors/emacs/patches/patch-az
+++ b/editors/emacs/patches/patch-az
@@ -1,6 +1,16 @@
-$NetBSD: patch-az,v 1.11 2000/09/03 14:44:41 wiz Exp $
---- src/unexelf.c.orig	Mon May 15 17:14:02 2000
-+++ src/unexelf.c	Wed Aug 23 21:25:31 2000
+$NetBSD: patch-az,v 1.12 2000/09/26 21:42:35 eeh Exp $
+
+--- src/unexelf.c.orig	Mon May 15 01:14:02 2000
++++ src/unexelf.c	Tue Sep 26 14:18:05 2000
+@@ -470,7 +470,7 @@
+ /*
+  * NetBSD does not have normal-looking user-land ELF support.
+  */
+-# ifdef __alpha__
++# if defined(__alpha__) || defined(__sparc_v9__)
+ #  define ELFSIZE	64
+ # else
+ #  define ELFSIZE	32
 @@ -479,6 +479,7 @@
  
  # ifndef PT_LOAD
diff --git a/editors/emacs/patches/patch-bg b/editors/emacs/patches/patch-bg
index a81910a5b41..9332340f84a 100644
--- a/editors/emacs/patches/patch-bg
+++ b/editors/emacs/patches/patch-bg
@@ -1,4 +1,4 @@
-$NetBSD: patch-bg,v 1.2 2000/06/24 17:03:39 minoura Exp $
+$NetBSD: patch-bg,v 1.3 2000/09/26 21:42:35 eeh Exp $
 
 --- configure.in.orig	Tue Jun  6 00:42:49 2000
 +++ configure.in	Sun Jun 18 09:22:42 2000
@@ -18,7 +18,8 @@ $NetBSD: patch-bg,v 1.2 2000/06/24 17:03:39 minoura Exp $
 +      mipsel-*-netbsd*)	machine=pmax ;;
        ns32k-*-netbsd*)	machine=ns32000 ;;
 +      powerpc-*-netbsd*) machine=macppc ;;
-       sparc-*-netbsd*)	machine=sparc ;;
+-      sparc-*-netbsd*)	machine=sparc ;;
++      sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
      esac
diff --git a/editors/emacs/patches/patch-bh b/editors/emacs/patches/patch-bh
new file mode 100644
index 00000000000..134340eab56
--- /dev/null
+++ b/editors/emacs/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2000/09/26 21:42:35 eeh Exp $
+
+--- ./src/frame.h.orig	Sat Apr 25 16:17:34 1998
++++ ./src/frame.h	Tue Sep 26 09:38:18 2000
+@@ -186,7 +186,7 @@
+      it is defined in xterm.h.  
+      struct w32_output is used for W32 window frames;
+      it is defined in w32term.h.  */
+-  union output_data { struct x_output *x; struct w32_output *w32; int nothing; } output_data;
++  union output_data { struct x_output *x; struct w32_output *w32; EMACS_INT nothing; } output_data;
+ 
+ #ifdef MULTI_KBOARD
+   /* A pointer to the kboard structure associated with this frame.
diff --git a/editors/emacs/patches/patch-bi b/editors/emacs/patches/patch-bi
new file mode 100644
index 00000000000..235e6037d29
--- /dev/null
+++ b/editors/emacs/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2000/09/26 21:42:35 eeh Exp $
+
+--- ./src/gmalloc.c.orig	Mon Feb 21 05:21:51 2000
++++ ./src/gmalloc.c	Tue Sep 26 09:44:47 2000
+@@ -371,7 +371,7 @@
+ /* Are you experienced?  */
+ int __malloc_initialized;
+ 
+-__malloc_size_t __malloc_extra_blocks;
++__malloc_size_t __malloc_extra_blocks = 0;
+ 
+ void (*__malloc_initialize_hook) PP ((void));
+ void (*__after_morecore_hook) PP ((void));
diff --git a/editors/emacs/patches/patch-bj b/editors/emacs/patches/patch-bj
new file mode 100644
index 00000000000..dd0d0f3b429
--- /dev/null
+++ b/editors/emacs/patches/patch-bj
@@ -0,0 +1,104 @@
+$NetBSD: patch-bj,v 1.1 2000/09/26 21:42:35 eeh Exp $
+
+--- ./src/lisp.h.orig	Sun Jan  3 08:31:23 1999
++++ ./src/lisp.h	Tue Sep 26 09:48:10 2000
+@@ -123,25 +123,25 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
++    long int i;
+ 
+     struct
+       {
+-	int val: VALBITS;
+-	int type: GCTYPEBITS+1;
++	long int val: VALBITS;
++	long int type: GCTYPEBITS+1;
+       } s;
+     struct
+       {
+-	unsigned int val: VALBITS;
+-	int type: GCTYPEBITS+1;
++	long unsigned int val: VALBITS;
++	long int type: GCTYPEBITS+1;
+       } u;
+     struct
+       {
+-	unsigned int val: VALBITS;
++	long unsigned int val: VALBITS;
+ 	enum Lisp_Type type: GCTYPEBITS;
+ 	/* The markbit is not really part of the value of a Lisp_Object,
+ 	   and is always zero except during garbage collection.  */
+-	unsigned int markbit: 1;
++	long unsigned int markbit: 1;
+       } gu;
+   }
+ Lisp_Object;
+@@ -153,17 +153,17 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
++    long int i;
+ 
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	int val: VALBITS;
++	long int type: GCTYPEBITS+1;
++	long int val: VALBITS;
+       } s;
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	unsigned int val: VALBITS;
++	long int type: GCTYPEBITS+1;
++	long unsigned int val: VALBITS;
+       } u;
+     struct
+       {
+@@ -171,7 +171,7 @@
+ 	   and is always zero except during garbage collection.  */
+ 	unsigned int markbit: 1;
+ 	enum Lisp_Type type: GCTYPEBITS;
+-	unsigned int val: VALBITS;
++	long unsigned int val: VALBITS;
+       } gu;
+   }
+ Lisp_Object;
+@@ -270,14 +270,14 @@
+ /* Extract the value of a Lisp_Object as a signed integer.  */
+ 
+ #ifndef XINT   /* Some machines need to do this differently.  */
+-#define XINT(a) (((a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
++#define XINT(a) (EMACS_INT) (((a) << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #endif
+ 
+ /* Extract the value as an unsigned integer.  This is a basis
+    for extracting it as a pointer to a structure in storage.  */
+ 
+ #ifndef XUINT
+-#define XUINT(a) ((a) & VALMASK)
++#define XUINT(a) (EMACS_UINT) ((a) & VALMASK)
+ #endif
+ 
+ #ifndef XPNTR
+@@ -358,7 +358,7 @@
+ 
+ #ifdef EXPLICIT_SIGN_EXTEND
+ /* Make sure we sign-extend; compilers have been known to fail to do so.  */
+-#define XINT(a) (((a).i << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
++#define XINT(a) (((a).i << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #else
+ #define XINT(a) ((a).s.val)
+ #endif /* EXPLICIT_SIGN_EXTEND */
+@@ -367,7 +367,7 @@
+ #define XPNTR(a) ((a).u.val)
+ 
+ #define XSET(var, vartype, ptr) \
+-   (((var).s.type = ((char) (vartype))), ((var).s.val = ((int) (ptr))))
++   (((var).s.type = ((char) (vartype))), ((var).s.val = ((EMACS_INT) (ptr))))
+ 
+ extern Lisp_Object make_number ();
+ 
diff --git a/editors/emacs/patches/patch-bk b/editors/emacs/patches/patch-bk
new file mode 100644
index 00000000000..9c59a0e738c
--- /dev/null
+++ b/editors/emacs/patches/patch-bk
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.1 2000/09/26 21:42:36 eeh Exp $
+
+--- ./lib-src/sorted-doc.c.orig	Tue Mar 30 11:07:02 1999
++++ ./lib-src/sorted-doc.c	Tue Sep 26 09:32:51 2000
+@@ -7,6 +7,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ extern char *malloc ();
+ char *xmalloc ();
diff --git a/editors/emacs/patches/patch-bl b/editors/emacs/patches/patch-bl
new file mode 100644
index 00000000000..e5e11f581d5
--- /dev/null
+++ b/editors/emacs/patches/patch-bl
@@ -0,0 +1,40 @@
+$NetBSD: patch-bl,v 1.1 2000/09/26 21:42:36 eeh Exp $
+
+--- ./src/m/sparc.h.orig	Sat Sep  6 11:51:04 1997
++++ ./src/m/sparc.h	Tue Sep 26 12:36:05 2000
+@@ -117,3 +117,35 @@
+ #define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
+ 
+ #endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
++
++#ifdef __arch64__		/* GCC, 64-bit ABI.  */
++#define EMACS_INT long
++#define BITS_PER_LONG 64
++#define BITS_PER_EMACS_INT BITS_PER_LONG
++#define EMACS_UINT unsigned long
++#define SPECIAL_EMACS_INT
++
++/* On the 64 bit architecture, we can use 60 bits for addresses */
++
++#define VALBITS         60
++
++/* This definition of MARKBIT is necessary because of the comparison of
++   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
++
++#define MARKBIT         0x8000000000000000L
++
++/* Define XINT and XUINT so that they can take arguments of type int */
++
++#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
++#define XUINT(a) ((long) (a) & VALMASK)
++
++/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
++
++#define XPNTR(a) XUINT (a)
++
++#define PNTR_COMPARISON_TYPE unsigned long
++#ifndef _LP64
++#define _LP64			/* Done on Alpha -- not sure if it
++				   should be here.  -- fx */
++#endif
++#endif
diff --git a/editors/emacs/patches/patch-bm b/editors/emacs/patches/patch-bm
new file mode 100644
index 00000000000..17924bafbf0
--- /dev/null
+++ b/editors/emacs/patches/patch-bm
@@ -0,0 +1,19 @@
+$NetBSD: patch-bm,v 1.1 2000/09/26 21:42:36 eeh Exp $
+
+--- ./src/alloc.c.orig	Thu Sep 16 00:20:15 1999
++++ ./src/alloc.c	Tue Sep 26 11:54:24 2000
+@@ -53,12 +53,13 @@
+ 
+ #if defined (__STDC__) && __STDC__
+ #include <stddef.h>
++#include <malloc.h>
+ #define	__malloc_size_t		size_t
+ #else
+ #define	__malloc_size_t		unsigned int
+ #endif
+ extern __malloc_size_t _bytes_used;
+-extern int __malloc_extra_blocks;
++extern __malloc_size_t __malloc_extra_blocks;
+ #endif /* !defined(DOUG_LEA_MALLOC) */
+ 
+ #define max(A,B) ((A) > (B) ? (A) : (B))