]>
Commit | Line | Data |
---|---|---|
0800c7da JR |
1 | diff -urN emacs-20.6/config.guess emacs-20.6-lia/config.guess |
2 | --- emacs-20.6/config.guess Wed Jul 14 09:49:28 1999 | |
3 | +++ emacs-20.6-lia/config.guess Sun Mar 5 22:53:50 2000 | |
4 | @@ -638,6 +638,7 @@ | |
5 | case "$ld_supported_emulations" in | |
6 | i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; | |
7 | i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; | |
8 | + elf64_ia64) echo "${UNAME_MACHINE}-pc-linux" ; exit 0 ;; | |
9 | sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; | |
10 | armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; | |
11 | m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; | |
12 | diff -urN emacs-20.6/config.sub emacs-20.6-lia/config.sub | |
13 | --- emacs-20.6/config.sub Wed Jul 14 09:49:25 1999 | |
14 | +++ emacs-20.6-lia/config.sub Sun Mar 5 22:52:33 2000 | |
15 | @@ -167,6 +167,7 @@ | |
16 | | 580 | i960 | h8300 \ | |
17 | | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | |
18 | | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | |
19 | + | ia64 \ | |
20 | | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | |
21 | | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | |
22 | | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | |
23 | @@ -185,6 +186,10 @@ | |
24 | i[34567]86) | |
25 | basic_machine=$basic_machine-pc | |
26 | ;; | |
27 | + ia64) | |
28 | + basic_machine=$basic_machine-pc | |
29 | + ;; | |
30 | + | |
31 | # Object if more than one company name word. | |
32 | *-*-*) | |
33 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | |
34 | @@ -198,6 +203,7 @@ | |
35 | | xmp-* | ymp-* \ | |
36 | | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ | |
37 | | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | |
38 | + | ia64-* \ | |
39 | | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | |
40 | | clipper-* | orion-* \ | |
41 | | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ | |
42 | diff -urN emacs-20.6/configure.in emacs-20.6-lia/configure.in | |
43 | --- emacs-20.6/configure.in Sat Feb 26 04:07:02 2000 | |
44 | +++ emacs-20.6-lia/configure.in Sun Mar 5 22:42:57 2000 | |
45 | @@ -928,6 +928,11 @@ | |
46 | machine=wicat opsys=usg5-2 | |
47 | ;; | |
48 | ||
49 | + ## IA-64 | |
50 | + ia64*-*-linux* ) | |
51 | + machine=ia64 opsys=gnu-linux | |
52 | + ;; | |
53 | + | |
54 | ## Intel 386 machines where we don't care about the manufacturer | |
55 | i[3456]86-*-* ) | |
56 | machine=intel386 | |
57 | diff -urN emacs-20.6/src/m/ia64.h emacs-20.6-lia/src/m/ia64.h | |
58 | --- emacs-20.6/src/m/ia64.h Wed Dec 31 16:00:00 1969 | |
59 | +++ emacs-20.6-lia/src/m/ia64.h Sun Mar 5 22:42:57 2000 | |
60 | @@ -0,0 +1,210 @@ | |
61 | +/* machine description file for the IA-64 architecture. | |
62 | + Copyright (C) 1999 Free Software Foundation, Inc. | |
63 | + Contributed by David Mosberger <davidm@hpl.hp.com> | |
64 | + | |
65 | +This file is part of GNU Emacs. | |
66 | + | |
67 | +GNU Emacs is free software; you can redistribute it and/or modify | |
68 | +it under the terms of the GNU General Public License as published by | |
69 | +the Free Software Foundation; either version 1, or (at your option) | |
70 | +any later version. | |
71 | + | |
72 | +GNU Emacs is distributed in the hope that it will be useful, | |
73 | +but WITHOUT ANY WARRANTY; without even the implied warranty of | |
74 | +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
75 | +GNU General Public License for more details. | |
76 | + | |
77 | +You should have received a copy of the GNU General Public License | |
78 | +along with GNU Emacs; see the file COPYING. If not, write to | |
79 | +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
80 | +Boston, MA 02111-1307, USA. */ | |
81 | + | |
82 | + | |
83 | +/* The following line tells the configuration script what sort of | |
84 | + operating system this machine is likely to run. | |
85 | + USUAL-OPSYS="note" | |
86 | + | |
87 | +NOTE-START | |
88 | +Use -opsystem=linux | |
89 | +NOTE-END | |
90 | + | |
91 | +*/ | |
92 | + | |
93 | +#define BITS_PER_LONG 64 | |
94 | +#define BITS_PER_EMACS_INT 64 | |
95 | + | |
96 | +/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word | |
97 | + is the most significant byte. */ | |
98 | + | |
99 | +#undef WORDS_BIG_ENDIAN | |
100 | + | |
101 | +/* Define NO_ARG_ARRAY if you cannot take the address of the first of a | |
102 | + * group of arguments and treat it as an array of the arguments. */ | |
103 | + | |
104 | +#define NO_ARG_ARRAY | |
105 | + | |
106 | +/* Define WORD_MACHINE if addresses and such have | |
107 | + * to be corrected before they can be used as byte counts. */ | |
108 | + | |
109 | +/* #define WORD_MACHINE */ | |
110 | + | |
111 | +/* Now define a symbol for the cpu type, if your compiler | |
112 | + does not define it automatically: | |
113 | + Ones defined so far include vax, m68000, ns16000, pyramid, | |
114 | + orion, tahoe, APOLLO and many others */ | |
115 | + | |
116 | +/* __ia64__ defined automatically */ | |
117 | + | |
118 | + | |
119 | +/* Use type EMACS_INT rather than a union, to represent Lisp_Object */ | |
120 | +/* This is desirable for most machines. */ | |
121 | + | |
122 | +#define NO_UNION_TYPE | |
123 | + | |
124 | +/* Define the type to use. */ | |
125 | +#define EMACS_INT long | |
126 | +#define EMACS_UINT unsigned long | |
127 | +#define SPECIAL_EMACS_INT | |
128 | + | |
129 | +/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend | |
130 | + the 24-bit bit field into an int. In other words, if bit fields | |
131 | + are always unsigned. | |
132 | + | |
133 | + If you use NO_UNION_TYPE, this flag does not matter. */ | |
134 | + | |
135 | +#define EXPLICIT_SIGN_EXTEND | |
136 | + | |
137 | +/* Data type of load average, as read out of kmem. */ | |
138 | + | |
139 | +#define LOAD_AVE_TYPE long | |
140 | + | |
141 | +/* Convert that into an integer that is 100 for a load average of 1.0 */ | |
142 | + | |
143 | +#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | |
144 | + | |
145 | +/* Define CANNOT_DUMP on machines where unexec does not work. | |
146 | + Then the function dump-emacs will not be defined | |
147 | + and temacs will do (load "loadup") automatically unless told otherwise. */ | |
148 | +#if 0 | |
149 | +#define CANNOT_DUMP | |
150 | +#endif | |
151 | + | |
152 | +/* Define VIRT_ADDR_VARIES if the virtual addresses of | |
153 | + pure and impure space as loaded can vary, and even their | |
154 | + relative order cannot be relied on. | |
155 | + | |
156 | + Otherwise Emacs assumes that text space precedes data space, | |
157 | + numerically. */ | |
158 | + | |
159 | +/* #define VIRT_ADDR_VARIES */ | |
160 | + | |
161 | +/* Define C_ALLOCA if this machine does not support a true alloca | |
162 | + and the one written in C should be used instead. | |
163 | + Define HAVE_ALLOCA to say that the system provides a properly | |
164 | + working alloca function and it should be used. | |
165 | + Define neither one if an assembler-language alloca | |
166 | + in the file alloca.s should be used. */ | |
167 | + | |
168 | +#define HAVE_ALLOCA | |
169 | + | |
170 | +/* Define the following if GNU malloc and the relocating allocator do | |
171 | + not work together with X. */ | |
172 | + | |
173 | +/* #define SYSTEM_MALLOC */ | |
174 | + | |
175 | +/* Define NO_REMAP if memory segmentation makes it not work well | |
176 | + to change the boundary between the text section and data section | |
177 | + when Emacs is dumped. If you define this, the preloaded Lisp | |
178 | + code will not be sharable; but that's better than failing completely. */ | |
179 | + | |
180 | +/* #define NO_REMAP */ | |
181 | + | |
182 | +/* Some really obscure 4.2-based systems (like Sequent DYNIX) | |
183 | + * do not support asynchronous I/O (using SIGIO) on sockets, | |
184 | + * even though it works fine on tty's. If you have one of | |
185 | + * these systems, define the following, and then use it in | |
186 | + * config.h (or elsewhere) to decide when (not) to use SIGIO. | |
187 | + * | |
188 | + * You'd think this would go in an operating-system description file, | |
189 | + * but since it only occurs on some, but not all, BSD systems, the | |
190 | + * reasonable place to select for it is in the machine description | |
191 | + * file. | |
192 | + */ | |
193 | + | |
194 | +/* #undef NO_SOCK_SIGIO */ | |
195 | + | |
196 | +#ifdef __ELF__ | |
197 | +#undef UNEXEC | |
198 | +#define UNEXEC unexelf.o | |
199 | +#endif | |
200 | + | |
201 | +#define PNTR_COMPARISON_TYPE unsigned long | |
202 | + | |
203 | +/* On the 64 bit architecture, we can use 60 bits for addresses */ | |
204 | + | |
205 | +#define VALBITS 60 | |
206 | + | |
207 | +/* This definition of MARKBIT is necessary because of the comparison of | |
208 | + ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */ | |
209 | + | |
210 | +#define MARKBIT 0x8000000000000000L | |
211 | + | |
212 | +/* Define XINT and XUINT so that they can take arguments of type int */ | |
213 | + | |
214 | +#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS)) | |
215 | +#define XUINT(a) ((long) (a) & VALMASK) | |
216 | + | |
217 | +/* Declare malloc and realloc in a way that is clean. | |
218 | + But not in makefiles! */ | |
219 | + | |
220 | +#ifndef NOT_C_CODE | |
221 | +/* We need these because pointers are larger than the default ints. */ | |
222 | +# if !defined(__NetBSD__) && !defined(__OpenBSD__) | |
223 | +# include <alloca.h> | |
224 | +# else | |
225 | +# include <stdlib.h> | |
226 | +# endif | |
227 | + | |
228 | +/* Hack alert! For reasons unknown to mankind the string.h file insists | |
229 | + on defining bcopy etc. as taking char pointers as arguments. With | |
230 | + Emacs this produces an endless amount of warning which are harmless, | |
231 | + but tends to flood the real errors. This hack works around this problem | |
232 | + by not prototyping. */ | |
233 | +#define bcopy string_h_bcopy | |
234 | +#define bzero string_h_bzero | |
235 | +#define bcmp string_h_bcmp | |
236 | +#include <string.h> | |
237 | +#undef bcopy | |
238 | +#undef bzero | |
239 | +#undef bcmp | |
240 | + | |
241 | +/* We need to prototype these for the lib-src programs even if we don't | |
242 | + use the system malloc for the Emacs proper. */ | |
243 | +#ifdef _MALLOC_INTERNAL | |
244 | +/* These declarations are designed to match the ones in gmalloc.c. */ | |
245 | +#if defined (__STDC__) && __STDC__ | |
246 | +extern void *malloc (), *realloc (), *calloc (); | |
247 | +#else | |
248 | +extern char *malloc (), *realloc (), *calloc (); | |
249 | +#endif | |
250 | +#else /* not _MALLOC_INTERNAL */ | |
251 | +extern void *malloc (), *realloc (), *calloc (); | |
252 | +#endif /* not _MALLOC_INTERNAL */ | |
253 | + | |
254 | +extern long *xmalloc (), *xrealloc (); | |
255 | + | |
256 | +#ifdef REL_ALLOC | |
257 | +#ifndef _MALLOC_INTERNAL | |
258 | +/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it | |
259 | + is allowed to prototype these as "void *" so we don't prototype in | |
260 | + that case. You're right: it stinks! */ | |
261 | +extern char *r_alloc (), *r_re_alloc (); | |
262 | +extern void r_alloc_free (); | |
263 | +#endif /* not _MALLOC_INTERNAL */ | |
264 | +#endif /* REL_ALLOC */ | |
265 | + | |
266 | +#endif /* not NOT_C_CODE */ | |
267 | + | |
268 | +#define DATA_SEG_BITS 0x6000000000000000 | |
269 | + | |
270 | +#define HAVE_TEXT_START |