diff options
author | eeh <eeh@pkgsrc.org> | 2000-09-26 21:42:30 +0000 |
---|---|---|
committer | eeh <eeh@pkgsrc.org> | 2000-09-26 21:42:30 +0000 |
commit | c3b085928bf594149ec63951ceabee004cb6d326 (patch) | |
tree | 01f00f76e69c91c02688ccea976f1eb4c0b1eae6 /editors/emacs/patches | |
parent | ab20de453f6904ce7e47000d25a94bc9c800fcbe (diff) | |
download | pkgsrc-c3b085928bf594149ec63951ceabee004cb6d326.tar.gz |
Add support for NetBSD/sparc64.
Diffstat (limited to 'editors/emacs/patches')
-rw-r--r-- | editors/emacs/patches/patch-ab | 9 | ||||
-rw-r--r-- | editors/emacs/patches/patch-az | 16 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bg | 5 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bh | 13 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bi | 13 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bj | 104 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bk | 12 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bl | 40 | ||||
-rw-r--r-- | editors/emacs/patches/patch-bm | 19 |
9 files changed, 222 insertions, 9 deletions
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)) |