Attachment #40844 for bug #64084

View | Details | Raw Unified | Return to bug 64084
Collapse All | Expand All




--- configure.in.orig	Sun Mar 16 14:06:05 2003
+++ configure.in	Wed Mar 10 21:30:53 2004
@@ -179,6 +179,18 @@
 machine='' opsys='' unported=no
 case "${canonical}" in
 

+    opsys=freebsd
+    case "${canonical}" in
+      alpha*-*-freebsd*)       machine=alpha ;;
+      amd64-*-freebsd*)        machine=amd64 ;;
+      ia64-*-freebsd*)         machine=ia64 ;;
+      i[3456]86-*-freebsd*)    machine=intel386 ;;
+      sparc64-*-freebsd*)      machine=sparc ;;

   ## NetBSD ports
   *-*-netbsd* )
     opsys=netbsd
@@ -1032,7 +1044,6 @@
 				;;
       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
       *-386bsd* )	        opsys=386bsd ;;

       *-nextstep* )             opsys=nextstep ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
@@ -2050,6 +2061,7 @@
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 AC_CHECK_LIB(intl, dgettext)




--- src/m/amd64.h.orig	Wed Dec 31 18:00:00 1969
+++ src/m/amd64.h	Thu Dec 18 00:21:51 2003
@@ -0,0 +1,181 @@
+/* machine description file For the amd64 chip.
+   Copyright (C) 1994, 1997, 1999 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 1, 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="note"
+
+NOTE-START
+Use -opsystem=freebsd
+NOTE-END
+
+*/
+
+#define BITS_PER_LONG 64
+#define BITS_PER_EMACS_INT 64
+#ifndef _LP64
+#define _LP64
+#endif
+
+/* 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
+
+/* 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 */
+
+/* __amd64__ defined automatically */
+
+
+/* Use type EMACS_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.  */
+
+#undef 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 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 HAVE_ALLOCA
+
+/* GNU malloc and the relocating allocator do not work together
+   with X.   [Who wrote that?]  */
+
+/* May 1995: reportedly [Rainer Schoepf <schoepf@uni-mainz.de>] both the
+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
+   "alpha-dec-osf3.2".  */
+
+/* May 1995: it seems to me [Morten Welinder <terra@diku.dk>] that both
+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
+   right now.  Feel free to play if you want.  */
+
+/* #define SYSTEM_MALLOC */
+
+#ifdef __ELF__
+/* With ELF, make sure that all common symbols get allocated to in the
+   data section.  Otherwise, the dump of temacs may miss variables in
+   the shared library that have been initialized.  For example, with
+   GNU libc, __malloc_initialized would normally be resolved to the
+   shared library's .bss section, which is fatal.  */
+# ifdef __GNUC__
+#  define C_SWITCH_MACHINE	-fno-common
+# else
+#  error What gives?  Fix me if DEC Unix supports ELF now.
+# endif
+#endif
+
+#if defined(__OpenBSD__)
+#define ORDINARY_LINK
+#endif
+
+#ifdef __ELF__
+#undef UNEXEC
+#define UNEXEC unexelf.o
+#endif
+
+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
+/* This controls a conditional in main.  */
+#define LINUX_SBRK_BUG
+#endif
+
+
+#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)
+
+#ifndef NOT_C_CODE
+/* We need these because pointers are larger than the default ints.  */
+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+#include <alloca.h>
+#endif
+#endif /* not NOT_C_CODE */
+
+/* On the Alpha it's best to avoid including TERMIO since struct
+   termio and struct termios are mutually incompatible.  */
+/* #define NO_TERMIO */
+
+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
+# define TEXT_END ({ extern int _etext; &_etext; })
+# ifndef __ELF__
+#  define COFF
+#  define DATA_END ({ extern int _EDATA; &_EDATA; })
+# endif /* notdef __ELF__ */
+#endif
+
+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
+#define HAVE_TEXT_START
+#endif
+
+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
+   they generate code that uses a signaling NaN instead of DBL_MIN.
+   Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
+   this avoids the assembler bug.  */
+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */
--- src/mem-limits.h.~1~	Wed Mar  8 12:49:46 2000
+++ src/mem-limits.h	Wed Dec 17 03:15:24 2003
@@ -98,7 +98,7 @@
 static POINTER data_space_start;
 
 /* Number of bytes of writable memory we can expect to be able to get */
-static unsigned long lim_data;
+static rlim_t lim_data;
 
 #ifdef NO_LIM_DATA
 static void

Return to bug 64084

Lines 1-6 Link Here

(-)ports/editors/emacs21/files/patch-configure.in (-4 / +5 lines)
1	--- configure.in.orig Sun Mar 16 14:06:05 2003	1	--- configure.in.orig Sun Mar 16 14:06:05 2003
2	+++ configure.in Thu Nov 20 13:54:06 2003	2	+++ configure.in Wed Mar 10 21:30:53 2004
3	@@ -179,6 +179,17 @@	3	@@ -179,6 +179,18 @@
4	machine='' opsys='' unported=no	4	machine='' opsys='' unported=no
5	case "${canonical}" in	5	case "${canonical}" in
6		6
Lines 9-14 Link Here
9	+ opsys=freebsd	9	+ opsys=freebsd
10	+ case "${canonical}" in	10	+ case "${canonical}" in
11	+ alpha--freebsd*) machine=alpha ;;	11	+ alpha--freebsd*) machine=alpha ;;
		12	+ amd64--freebsd) machine=amd64 ;;
12	+ ia64--freebsd) machine=ia64 ;;	13	+ ia64--freebsd) machine=ia64 ;;
13	+ i[3456]86--freebsd) machine=intel386 ;;	14	+ i[3456]86--freebsd) machine=intel386 ;;
14	+ sparc64--freebsd) machine=sparc ;;	15	+ sparc64--freebsd) machine=sparc ;;
Lines 18-24 Link Here
18	## NetBSD ports	19	## NetBSD ports
19	--netbsd* )	20	--netbsd* )
20	opsys=netbsd	21	opsys=netbsd
21	@@ -1032,7 +1043,6 @@	22	@@ -1032,7 +1044,6 @@
22	;;	23	;;
23	-sysv4.2uw ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;	24	-sysv4.2uw ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
24	-386bsd ) opsys=386bsd ;;	25	-386bsd ) opsys=386bsd ;;
Lines 26-32 Link Here
26	-nextstep ) opsys=nextstep ;;	27	-nextstep ) opsys=nextstep ;;
27	## Otherwise, we'll fall through to the generic opsys code at the bottom.	28	## Otherwise, we'll fall through to the generic opsys code at the bottom.
28	esac	29	esac
29	@@ -2050,6 +2060,7 @@	30	@@ -2050,6 +2061,7 @@
30	# Solaris requires -lintl if you want strerror (which calls dgettext)	31	# Solaris requires -lintl if you want strerror (which calls dgettext)
31	# to return localized messages.	32	# to return localized messages.
32	AC_CHECK_LIB(intl, dgettext)	33	AC_CHECK_LIB(intl, dgettext)

Added Link Here

(-)ports/editors/emacs21/files/patch-src:m:amd64.h (+195 lines)
1	--- src/m/amd64.h.orig Wed Dec 31 18:00:00 1969
2	+++ src/m/amd64.h Thu Dec 18 00:21:51 2003
3	@@ -0,0 +1,181 @@
4	+/* machine description file For the amd64 chip.
5	+ Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
6	+
7	+This file is part of GNU Emacs.
8	+
9	+GNU Emacs is free software; you can redistribute it and/or modify
10	+it under the terms of the GNU General Public License as published by
11	+the Free Software Foundation; either version 1, or (at your option)
12	+any later version.
13	+
14	+GNU Emacs is distributed in the hope that it will be useful,
15	+but WITHOUT ANY WARRANTY; without even the implied warranty of
16	+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17	+GNU General Public License for more details.
18	+
19	+You should have received a copy of the GNU General Public License
20	+along with GNU Emacs; see the file COPYING. If not, write to
21	+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22	+Boston, MA 02111-1307, USA. */
23	+
24	+
25	+/* The following line tells the configuration script what sort of
26	+ operating system this machine is likely to run.
27	+ USUAL-OPSYS="note"
28	+
29	+NOTE-START
30	+Use -opsystem=freebsd
31	+NOTE-END
32	+
33	+*/
34	+
35	+#define BITS_PER_LONG 64
36	+#define BITS_PER_EMACS_INT 64
37	+#ifndef _LP64
38	+#define _LP64
39	+#endif
40	+
41	+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
42	+ is the most significant byte. */
43	+
44	+#undef WORDS_BIG_ENDIAN
45	+
46	+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
47	+ * group of arguments and treat it as an array of the arguments. */
48	+
49	+#define NO_ARG_ARRAY
50	+
51	+/* Now define a symbol for the cpu type, if your compiler
52	+ does not define it automatically:
53	+ Ones defined so far include vax, m68000, ns16000, pyramid,
54	+ orion, tahoe, APOLLO and many others */
55	+
56	+/* __amd64__ defined automatically */
57	+
58	+
59	+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
60	+/* This is desirable for most machines. */
61	+
62	+#define NO_UNION_TYPE
63	+
64	+/* Define the type to use. */
65	+#define EMACS_INT long
66	+#define EMACS_UINT unsigned long
67	+#define SPECIAL_EMACS_INT
68	+
69	+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
70	+ the 24-bit bit field into an int. In other words, if bit fields
71	+ are always unsigned.
72	+
73	+ If you use NO_UNION_TYPE, this flag does not matter. */
74	+
75	+#undef EXPLICIT_SIGN_EXTEND
76	+
77	+/* Data type of load average, as read out of kmem. */
78	+
79	+#define LOAD_AVE_TYPE long
80	+
81	+/* Convert that into an integer that is 100 for a load average of 1.0 */
82	+
83	+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
84	+
85	+/* Define C_ALLOCA if this machine does not support a true alloca
86	+ and the one written in C should be used instead.
87	+ Define HAVE_ALLOCA to say that the system provides a properly
88	+ working alloca function and it should be used.
89	+ Define neither one if an assembler-language alloca
90	+ in the file alloca.s should be used. */
91	+
92	+#define HAVE_ALLOCA
93	+
94	+/* GNU malloc and the relocating allocator do not work together
95	+ with X. [Who wrote that?] */
96	+
97	+/* May 1995: reportedly [Rainer Schoepf <schoepf@uni-mainz.de>] both the
98	+ system and the gnu malloc system work with "alpha-dec-osf3.0" and
99	+ "alpha-dec-osf3.2". */
100	+
101	+/* May 1995: it seems to me [Morten Welinder <terra@diku.dk>] that both
102	+ mallocs work with "alpha-dec-osf2.0", but I daren't break anything
103	+ right now. Feel free to play if you want. */
104	+
105	+/* #define SYSTEM_MALLOC */
106	+
107	+#ifdef __ELF__
108	+/* With ELF, make sure that all common symbols get allocated to in the
109	+ data section. Otherwise, the dump of temacs may miss variables in
110	+ the shared library that have been initialized. For example, with
111	+ GNU libc, __malloc_initialized would normally be resolved to the
112	+ shared library's .bss section, which is fatal. */
113	+# ifdef __GNUC__
114	+# define C_SWITCH_MACHINE -fno-common
115	+# else
116	+# error What gives? Fix me if DEC Unix supports ELF now.
117	+# endif
118	+#endif
119	+
120	+#if defined(__OpenBSD__)
121	+#define ORDINARY_LINK
122	+#endif
123	+
124	+#ifdef __ELF__
125	+#undef UNEXEC
126	+#define UNEXEC unexelf.o
127	+#endif
128	+
129	+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
130	+/* This controls a conditional in main. */
131	+#define LINUX_SBRK_BUG
132	+#endif
133	+
134	+
135	+#define PNTR_COMPARISON_TYPE unsigned long
136	+
137	+/* On the 64 bit architecture, we can use 60 bits for addresses */
138	+
139	+#define VALBITS 60
140	+
141	+
142	+/* This definition of MARKBIT is necessary because of the comparison of
143	+ ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
144	+
145	+/* #define MARKBIT 0x8000000000000000L */
146	+
147	+
148	+/* Define XINT and XUINT so that they can take arguments of type int */
149	+
150	+#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
151	+#define XUINT(a) ((long) (a) & VALMASK)
152	+
153	+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
154	+
155	+#define XPNTR(a) XUINT (a)
156	+
157	+#ifndef NOT_C_CODE
158	+/* We need these because pointers are larger than the default ints. */
159	+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
160	+#include <alloca.h>
161	+#endif
162	+#endif /* not NOT_C_CODE */
163	+
164	+/* On the Alpha it's best to avoid including TERMIO since struct
165	+ termio and struct termios are mutually incompatible. */
166	+/* #define NO_TERMIO */
167	+
168	+#if defined (LINUX) \|\| defined (__NetBSD__) \|\| defined (__OpenBSD__)
169	+# define TEXT_END ({ extern int _etext; &_etext; })
170	+# ifndef __ELF__
171	+# define COFF
172	+# define DATA_END ({ extern int _EDATA; &_EDATA; })
173	+# endif /* notdef __ELF__ */
174	+#endif
175	+
176	+#if (defined (__NetBSD__) \|\| defined (__OpenBSD__)) && defined (__ELF__)
177	+#define HAVE_TEXT_START
178	+#endif
179	+
180	+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
181	+ they generate code that uses a signaling NaN instead of DBL_MIN.
182	+ Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
183	+ this avoids the assembler bug. */
184	+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */
185	--- src/mem-limits.h.~1~ Wed Mar 8 12:49:46 2000
186	+++ src/mem-limits.h Wed Dec 17 03:15:24 2003
187	@@ -98,7 +98,7 @@
188	static POINTER data_space_start;
189
190	/* Number of bytes of writable memory we can expect to be able to get */
191	-static unsigned long lim_data;
192	+static rlim_t lim_data;
193
194	#ifdef NO_LIM_DATA
195	static void