From fc846a903c606b0cf7fe06465b6a376da1a05814 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 25 Feb 2004 19:11:43 +0000 Subject: make yhis compile on amd64, based on Richard Rauch's patches (PR pkg/23701) --- editors/emacs/Makefile | 3 +- editors/emacs/distinfo | 4 +- editors/emacs/files/amd64.h | 131 +++++++++++++++++++++++++++++++++++++++++ editors/emacs/patches/patch-ab | 16 +++-- 4 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 editors/emacs/files/amd64.h (limited to 'editors/emacs') diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 9bf34fb2b86..b391a79eeac 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2004/01/27 00:53:12 heinz Exp $ +# $NetBSD: Makefile,v 1.68 2004/02/25 19:11:43 drochner Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-21.3 @@ -62,6 +62,7 @@ REPLACE_PERL= lib-src/grep-changelog post-extract: ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp + ${CP} ${FILESDIR}/amd64.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 e10ba29e9bc..fccac4eeae4 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2003/09/17 05:24:51 wiz Exp $ +$NetBSD: distinfo,v 1.15 2004/02/25 19:11:43 drochner Exp $ SHA1 (emacs-21.3.tar.gz) = a8aae1b619e50ed6fed5b1351b54b38ed98c61b8 Size (emacs-21.3.tar.gz) = 20399831 bytes SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5 -SHA1 (patch-ab) = dfb9fdf2dd97b60a2367736e702a6268ce2a00a0 +SHA1 (patch-ab) = 7e1523d174ef8083b0bcc6cbecde833502350109 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620 diff --git a/editors/emacs/files/amd64.h b/editors/emacs/files/amd64.h new file mode 100644 index 00000000000..de4eba0b24f --- /dev/null +++ b/editors/emacs/files/amd64.h @@ -0,0 +1,131 @@ +/* machine description file for AMD x86-64. + Copyright (C) 2002 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="linux" */ + +#define BITS_PER_LONG 64 +#define BITS_PER_EMACS_INT 64 + +/* 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. */ + +/* #define 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 */ +/* __x86_64 defined automatically. */ + +/* Use type int rather than a union, to represent Lisp_Object */ +/* This is desirable for most machines. */ + +#define NO_UNION_TYPE + +/* Define the type to use. */ +#define EMACS_INT long +#define EMACS_UINT unsigned long +#define SPECIAL_EMACS_INT + +/* 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. */ + +/* #define 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 /* XXX */ + +/* 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 */ /* XXX */ +#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 /* XXX */ + +#define PNTR_COMPARISON_TYPE unsigned long + +/* 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) + +/* #undef START_FILES */ /* XXX */ +/* #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o */ /* XXX */ + +/* #undef LIB_STANDARD */ /* XXX */ +/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */ diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index 5e991ee4a0f..82a288ab613 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.16 2003/07/06 16:10:18 uebayasi Exp $ +$NetBSD: patch-ab,v 1.17 2004/02/25 19:11:43 drochner Exp $ ---- configure.orig Sat Jun 14 12:55:08 2003 -+++ configure -@@ -9124,6 +9124,22 @@ +--- configure.orig 2003-03-18 15:19:12.000000000 +0100 ++++ configure 2004-02-25 20:04:08.000000000 +0100 +@@ -822,6 +822,7 @@ + sparc*-*-netbsd*) machine=sparc ;; + vax-*-netbsd*) machine=vax ;; + arm-*-netbsd*) machine=arm ;; ++ x86_64-*-netbsd*) machine=amd64 ;; + esac + ;; + +@@ -9124,6 +9125,22 @@ fi -- cgit v1.2.3