Fix build on sh3el. PR pkg/33418 from Yasushi Oshima.

4 files changed, 116 insertions, 7 deletions

diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index 9cc715326a8..98d2beeafae 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/12/29 14:04:56 joerg Exp $
+# $NetBSD: Makefile.common,v 1.6 2006/03/25 02:48:22 uebayasi Exp $
 
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=	markd@NetBSD.org
@@ -71,6 +71,7 @@ post-extract:
 	${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
 	${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
 	${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
+	${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 1c5d8b294d4..194f375a034 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2006/01/04 11:11:22 markd Exp $
+$NetBSD: distinfo,v 1.26 2006/03/25 02:48:22 uebayasi Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = af169f255e8b9568cdf92d6efa54a8d4c691a1bf
+SHA1 (patch-ab) = 003b22b938b0c41103c207079cf723ee077ffdaa
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
diff --git a/editors/emacs/files/sh3el.h b/editors/emacs/files/sh3el.h
new file mode 100644
index 00000000000..bdb735736c3
--- /dev/null
+++ b/editors/emacs/files/sh3el.h
@@ -0,0 +1,107 @@
+/* machine description file for sh3el
+   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 GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+/* 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 s- or .h>"  */
+
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
+
+#undef WORDS_BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments.  */
+
+#define NO_ARG_ARRAY
+
+/* 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 */
+
+/* Use type int rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines.  */
+
+#define NO_UNION_TYPE
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the 24-bit 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
+
+/* 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.  */
+
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index 1018cdf8667..8f60af81bf3 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.21 2005/12/29 13:56:51 joerg Exp $
+$NetBSD: patch-ab,v 1.22 2006/03/25 02:48:22 uebayasi Exp $
 
 --- configure.orig	2003-03-19 02:19:12.000000000 +1200
 +++ configure
-@@ -822,9 +822,14 @@ case "${canonical}" in
+@@ -822,9 +822,15 @@ case "${canonical}" in
        sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
        arm-*-netbsd*)	machine=arm ;;
 +      x86_64-*-netbsd*)	machine=amd64 ;;
 +      hppa-*-netbsd*)	machine=hp800 ;;
++      shle-*-netbsd*)	machine=sh3el ;;
      esac
    ;;
  
@@ -17,7 +18,7 @@ $NetBSD: patch-ab,v 1.21 2005/12/29 13:56:51 joerg Exp $
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
-@@ -1659,6 +1663,7 @@ case "${canonical}" in
+@@ -1659,6 +1665,7 @@ case "${canonical}" in
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
        *-freebsd* )	        opsys=freebsd ;;
@@ -25,7 +26,7 @@ $NetBSD: patch-ab,v 1.21 2005/12/29 13:56:51 joerg Exp $
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -9124,6 +9129,22 @@ EOF
+@@ -9124,6 +9131,22 @@ EOF
  fi