Make "xemacs" work on "arm32" port. Patches supplied by Richard Earnshaw

in PR pkg/6295.

10 files changed, 167 insertions, 15 deletions

diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index cef9d634844..d9d6803aa0a 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 1999/03/04 14:59:23 tron Exp $
+# $NetBSD: Makefile,v 1.41 1999/03/10 08:34:07 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 #
 
@@ -47,6 +47,7 @@ DEPENDS+=	faces-1.6.1:../../mail/faces
 WITH_XFACE=	--with-xface=no
 .endif
 
+CFLAGS+=	-g
 CONFIGURE_ARGS+=${MACHINE_GNU_ARCH}--netbsd --prefix=${PREFIX} \
 		--site-includes=${PREFIX}/include \
 		--infopath="${PREFIX}/info:${X11BASE}/info:/usr/local/info" \
diff --git a/editors/xemacs20/patches/patch-aa b/editors/xemacs20/patches/patch-aa
index 951b6425867..29b5aac1c66 100644
--- a/editors/xemacs20/patches/patch-aa
+++ b/editors/xemacs20/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 1998/08/29 12:31:43 garbled Exp $
+$NetBSD: patch-aa,v 1.4 1999/03/10 08:34:07 tron Exp $
+
 --- configure.orig	Mon Feb  9 20:59:34 1998
-+++ configure	Fri Aug 28 09:18:31 1998
-@@ -902,9 +902,10 @@
++++ configure	Sat Mar  6 11:03:31 1999
+@@ -835,6 +835,7 @@
+ machine='' opsys=''
+ 
+ case "$canonical" in
++  arm*-*-*	   ) machine=arm ;;
+   sparc-*-*        ) machine=sparc ;;
+   alpha-*-*        ) machine=alpha ;;
+   vax-*-*          ) machine=vax ;;
+@@ -902,9 +903,10 @@
      case "$canonical" in
        i[3-9]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
@@ -13,7 +22,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/29 12:31:43 garbled Exp $
      esac
    ;;
  
-@@ -2233,7 +2234,7 @@
+@@ -2233,7 +2235,7 @@
        echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
  echo "configure:2235: checking "for runtime libraries flag"" >&5
    dash_r=""
diff --git a/editors/xemacs20/patches/patch-ab b/editors/xemacs20/patches/patch-ab
index 8223f1f2eaa..6448403ac04 100644
--- a/editors/xemacs20/patches/patch-ab
+++ b/editors/xemacs20/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:34 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/03/10 08:34:07 tron Exp $
 
---- ./lib-src/send-pr-orig	Thu Jan 22 14:54:07 1998
-+++ ./lib-src/send-pr	Thu Jan 22 15:09:10 1998
+--- lib-src/send-pr-orig	Thu Jan 22 14:54:07 1998
++++ lib-src/send-pr	Thu Jan 22 15:09:10 1998
 @@ -35,7 +35,7 @@
  
  # Where the gnats category tree lives.
diff --git a/editors/xemacs20/patches/patch-af b/editors/xemacs20/patches/patch-af
index 3f392499b23..2266a5bf566 100644
--- a/editors/xemacs20/patches/patch-af
+++ b/editors/xemacs20/patches/patch-af
@@ -1,4 +1,5 @@
-$NetBSD: patch-af,v 1.3 1998/08/29 12:31:43 garbled Exp $
+$NetBSD: patch-af,v 1.4 1999/03/10 08:34:07 tron Exp $
+
 --- src/m/alpha.h.orig	Fri Jul 24 02:30:29 1998
 +++ src/m/alpha.h	Fri Jul 24 02:31:19 1998
 @@ -186,3 +186,5 @@
diff --git a/editors/xemacs20/patches/patch-ag b/editors/xemacs20/patches/patch-ag
index 62060c4ef0b..43c60ec6f29 100644
--- a/editors/xemacs20/patches/patch-ag
+++ b/editors/xemacs20/patches/patch-ag
@@ -1,4 +1,5 @@
-$NetBSD: patch-ag,v 1.1 1998/08/29 12:31:43 garbled Exp $
+$NetBSD: patch-ag,v 1.2 1999/03/10 08:34:08 tron Exp $
+
 --- /dev/null	Fri Jul 24 04:57:05 1998
 +++ src/netbsd.elf.h	Fri Jul 24 05:41:01 1998
 @@ -0,0 +1,322 @@
diff --git a/editors/xemacs20/patches/patch-ah b/editors/xemacs20/patches/patch-ah
index 523e2ca6836..fa646636155 100644
--- a/editors/xemacs20/patches/patch-ah
+++ b/editors/xemacs20/patches/patch-ah
@@ -1,7 +1,16 @@
-$NetBSD: patch-ah,v 1.1 1998/08/29 12:31:44 garbled Exp $
+$NetBSD: patch-ah,v 1.2 1999/03/10 08:34:08 tron Exp $
+
 --- configure.in.orig	Mon Feb  9 20:58:57 1998
-+++ configure.in	Fri Aug 28 08:23:21 1998
-@@ -1013,10 +1013,10 @@
++++ configure.in	Sat Mar  6 11:09:17 1999
+@@ -940,6 +940,7 @@
+ 
+ dnl Straightforward machine determination
+ case "$canonical" in
++  arm-*-*	   ) machine=arm ;;
+   sparc-*-*        ) machine=sparc ;;
+   alpha-*-*        ) machine=alpha ;;
+   vax-*-*          ) machine=vax ;;
+@@ -1013,10 +1014,10 @@
      case "$canonical" in
        i[[3-9]]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
diff --git a/editors/xemacs20/patches/patch-ai b/editors/xemacs20/patches/patch-ai
index a6f0ddf5fe5..2404749ba22 100644
--- a/editors/xemacs20/patches/patch-ai
+++ b/editors/xemacs20/patches/patch-ai
@@ -1,4 +1,5 @@
-$NetBSD: patch-ai,v 1.1 1998/08/29 12:31:44 garbled Exp $
+$NetBSD: patch-ai,v 1.2 1999/03/10 08:34:08 tron Exp $
+
 --- src/s/netbsd.h.orig	Fri Jul 24 05:57:27 1998
 +++ src/s/netbsd.h	Fri Jul 24 05:58:34 1998
 @@ -60,3 +60,7 @@
diff --git a/editors/xemacs20/patches/patch-aj b/editors/xemacs20/patches/patch-aj
index 61cfbe2557a..a9b224ac51f 100644
--- a/editors/xemacs20/patches/patch-aj
+++ b/editors/xemacs20/patches/patch-aj
@@ -1,4 +1,5 @@
-$NetBSD: patch-aj,v 1.1 1998/08/29 12:31:44 garbled Exp $
+$NetBSD: patch-aj,v 1.2 1999/03/10 08:34:08 tron Exp $
+
 --- src/unexelf.c.orig	Fri Jul 24 06:17:28 1998
 +++ src/unexelf.c	Fri Jul 24 06:17:36 1998
 @@ -419,3 +419,8 @@
diff --git a/editors/xemacs20/patches/patch-ak b/editors/xemacs20/patches/patch-ak
new file mode 100644
index 00000000000..c764ed69370
--- /dev/null
+++ b/editors/xemacs20/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 1999/03/10 08:34:08 tron Exp $
+
+--- src/unexfreebsd.c.orig	Sun Oct 12 02:40:17 1997
++++ src/unexfreebsd.c	Sat Mar  6 11:03:31 1999
+@@ -289,7 +289,7 @@
+   /* We can get relocation sites in the bss region, for objects whose
+      contents are copied from a shared library.  We don't need or want
+      to restore these at present. */
+-#ifndef sparc
++#if !defined(sparc) && !defined(__arm__)
+   if (ri->r_copy)
+     return;
+ #else
diff --git a/editors/xemacs20/patches/patch-al b/editors/xemacs20/patches/patch-al
new file mode 100644
index 00000000000..0687452e508
--- /dev/null
+++ b/editors/xemacs20/patches/patch-al
@@ -0,0 +1,116 @@
+$NetBSD: patch-al,v 1.1 1999/03/10 08:34:08 tron Exp $
+
+--- /dev/null	Sat Mar  6 04:34:35 1999
++++ src/m/arm.h	Sat Mar  6 11:25:20 1999
+@@ -0,0 +1,111 @@
++/* machine description file template.
++   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
++
++This file is part of GNU Emacs.
++
++GNU Emacs is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU Emacs is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with XEmacs; see the file COPYING.  If not, write to
++the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* Synched up with: FSF 19.31. */
++
++/* The following line tells the configuration script what sort of 
++   operating system this machine is likely to run.
++   USUAL-OPSYS="<name of system .h file here, without the .h>"  */
++
++/* Define WORD_MACHINE if addresses and such have
++ * to be corrected before they can be used as byte counts.  */
++
++#undef WORD_MACHINE
++
++/* Now define a symbol for the cpu type, if your compiler
++   does not define it automatically:
++   Ones defined so far include vax, m68000, ns16000, pyramid,
++   orion, tahoe, APOLLO and many others */
++#ifndef __arm__
++/* Netbsd's gcc-2.7 doesn't define __arm__: it should */
++#define __arm__
++#endif
++
++/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
++   the bit field into an int.  In other words, if bit fields
++   are always unsigned.
++
++   If you use NO_UNION_TYPE, this flag does not matter.  */
++
++#define EXPLICIT_SIGN_EXTEND
++
++/* Data type of load average, as read out of kmem.  */
++
++#define LOAD_AVE_TYPE long
++
++/* Convert that into an integer that is 100 for a load average of 1.0  */
++
++#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
++
++/* Define CANNOT_DUMP on machines where unexec does not work.
++   Then the function dump-emacs will not be defined
++   and temacs will do (load "loadup") automatically unless told otherwise.  */
++
++/* #undef CANNOT_DUMP */
++
++/* Define VIRT_ADDR_VARIES if the virtual addresses of
++   pure and impure space as loaded can vary, and even their
++   relative order cannot be relied on.
++
++   Otherwise Emacs assumes that text space precedes data space,
++   numerically.  */
++
++/* #define VIRT_ADDR_VARIES */
++
++/* Define C_ALLOCA if this machine does not support a true alloca
++   and the one written in C should be used instead.
++   Define HAVE_ALLOCA to say that the system provides a properly
++   working alloca function and it should be used.
++   Define neither one if an assembler-language alloca
++   in the file alloca.s should be used.  */
++
++/* #define C_ALLOCA */
++#define HAVE_ALLOCA
++
++/* Define NO_REMAP if memory segmentation makes it not work well
++   to change the boundary between the text section and data section
++   when Emacs is dumped.  If you define this, the preloaded Lisp
++   code will not be sharable; but that's better than failing completely.  */
++
++/* #define NO_REMAP */
++
++/* Some really obscure 4.2-based systems (like Sequent DYNIX)
++ * do not support asynchronous I/O (using SIGIO) on sockets,
++ * even though it works fine on tty's.  If you have one of
++ * these systems, define the following, and then use it in
++ * config.h (or elsewhere) to decide when (not) to use SIGIO.
++ *
++ * You'd think this would go in an operating-system description file,
++ * but since it only occurs on some, but not all, BSD systems, the
++ * reasonable place to select for it is in the machine description
++ * file.
++ */
++
++/* #define NO_SOCK_SIGIO */
++
++
++/* After adding support for a new system, modify the large case
++   statement in the `configure' script to recognize reasonable
++   configuration names, and add a description of the system to
++   `etc/MACHINES'.
++
++   If you've just fixed a problem in an existing configuration file,
++   you should also check `etc/MACHINES' to make sure its descriptions
++   of known problems in that configuration should be updated.  */