2 files changed, 4 insertions, 190 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3111472fe0c..f6aa7237227 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-16  Dave Love  <fx@gnu.org>
+        * m/iris5d.h: Deleted -- unused.
 2000-05-16  Gerd Moellmann  <gerd@gnu.org>
        * xdisp.c, w32.c, print.c, msdos.c, emacs.c: Use the term
diff --git a/src/m/iris5d.h b/src/m/iris5d.h
deleted file mode 100644
index 23b9aa35f69..00000000000
--- a/src/m/iris5d.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* machine description file for Iris-5D machines.  Use with s-iris3-6.h
-   Copyright (C) 1987 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="irix3-3"  */
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-#define 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 */
-#ifndef mips
-#define mips
-#endif
-#ifndef IRIS_4D
-#define IRIS_4D
-#endif
-/* 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 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      /* This doesn't quite work on the 4D */
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-/* s-iris3-6.h uses /vmunix */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-/* 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
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-#ifdef UNEXEC
-#undef UNEXEC
-#endif
-#define UNEXEC unexelf.o
-#define TEXT_START 0x400000
-/*
- * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
- * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
- * the value field of a LISP_OBJECT).
- */
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS   0x10000000
-#undef LIBS_MACHINE
-/* -lsun in case using Yellow Pages for passwords.  */
-#if defined(__GNUC__) && defined(_ABIN32)
-#define LIBS_MACHINE -lsun
-#else
-#define LIBS_MACHINE -lsun -lmld
-#endif
-#define LIBS_DEBUG
-/* Define this if you have a fairly recent system,
-   in which crt1.o and crt1.n should be used.  */
-#define HAVE_CRTN
-#ifdef HAVE_CRTN
-/* Must define START-FILES so that the linker can find /usr/lib/crt0.o.  */
-#define START_FILES pre-crt0.o /usr/lib/crt1.o
-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o
-#else
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-/* The entry-point label (start of text segment) is `start', not `__start'.  */
-#define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD -lbsd -lc
-#endif
-/* Use terminfo instead of termcap.  */
-#define TERMINFO
-/* sioctl.h should be included where appropriate.  */
-#define NEED_SIOCTL
-/* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-/* Define STACK_DIRECTION for alloca.c */
-#define STACK_DIRECTION -1
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short.  */
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-#define XMARKBIT(a) ((a) < 0)
-#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
-#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#ifndef __GNUC__
-/* Turn off some "helpful" error checks for type mismatches
-   that we can't fix without breaking other machines.  */
-#define C_SWITCH_MACHINE -cckr
-#endif

diff --git a/src/ChangeLog b/src/ChangeLog index 3111472fe0c..f6aa7237227 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -1,3 +1,7 @@
		1	2000-05-16 Dave Love <fx@gnu.org>
		2
		3	* m/iris5d.h: Deleted -- unused.
		4
1	2000-05-16 Gerd Moellmann <gerd@gnu.org>	5	2000-05-16 Gerd Moellmann <gerd@gnu.org>
2		6
3	* xdisp.c, w32.c, print.c, msdos.c, emacs.c: Use the term	7	* xdisp.c, w32.c, print.c, msdos.c, emacs.c: Use the term


diff --git a/src/m/iris5d.h b/src/m/iris5d.h deleted file mode 100644 index 23b9aa35f69..00000000000 --- a/src/m/iris5d.h +++ /dev/null
@@ -1,190 +0,0 @@
1	/* machine description file for Iris-5D machines. Use with s-iris3-6.h
2	Copyright (C) 1987 Free Software Foundation, Inc.
3
4	This file is part of GNU Emacs.
5
6	GNU Emacs is free software; you can redistribute it and/or modify
7	it under the terms of the GNU General Public License as published by
8	the Free Software Foundation; either version 2, or (at your option)
9	any later version.
10
11	GNU Emacs is distributed in the hope that it will be useful,
12	but WITHOUT ANY WARRANTY; without even the implied warranty of
13	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	GNU General Public License for more details.
15
16	You should have received a copy of the GNU General Public License
17	along with GNU Emacs; see the file COPYING. If not, write to
18	the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19	Boston, MA 02111-1307, USA. */
20
21
22	/* The following line tells the configuration script what sort of
23	operating system this machine is likely to run.
24	USUAL-OPSYS="irix3-3" */
25
26	/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
27	is the most significant byte. */
28
29	#define WORDS_BIG_ENDIAN
30
31	/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
32	* group of arguments and treat it as an array of the arguments. */
33
34	#define NO_ARG_ARRAY
35
36	/* Define WORD_MACHINE if addresses and such have
37	* to be corrected before they can be used as byte counts. */
38
39	#undef WORD_MACHINE
40
41	/* Now define a symbol for the cpu type, if your compiler
42	does not define it automatically:
43	Ones defined so far include vax, m68000, ns16000, pyramid,
44	orion, tahoe, APOLLO and many others */
45
46	#ifndef mips
47	#define mips
48	#endif
49
50	#ifndef IRIS_4D
51	#define IRIS_4D
52	#endif
53
54	/* Use type int rather than a union, to represent Lisp_Object */
55	/* This is desirable for most machines. */
56
57	#define NO_UNION_TYPE
58
59	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
60	the bit field into an int. In other words, if bit fields
61	are always unsigned.
62
63	If you use NO_UNION_TYPE, this flag does not matter. */
64
65	#define EXPLICIT_SIGN_EXTEND
66
67	/* Data type of load average, as read out of kmem. */
68
69	#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
70
71	/* Convert that into an integer that is 100 for a load average of 1.0 */
72
73	#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
74
75	/* s-iris3-6.h uses /vmunix */
76
77	#undef KERNEL_FILE
78	#define KERNEL_FILE "/unix"
79
80	/* Define CANNOT_DUMP on machines where unexec does not work.
81	Then the function dump-emacs will not be defined
82	and temacs will do (load "loadup") automatically unless told otherwise. */
83
84	#undef CANNOT_DUMP
85
86	/* Define VIRT_ADDR_VARIES if the virtual addresses of
87	pure and impure space as loaded can vary, and even their
88	relative order cannot be relied on.
89
90	Otherwise Emacs assumes that text space precedes data space,
91	numerically. */
92
93	/* #define VIRT_ADDR_VARIES */
94
95	/* Define C_ALLOCA if this machine does not support a true alloca
96	and the one written in C should be used instead.
97	Define HAVE_ALLOCA to say that the system provides a properly
98	working alloca function and it should be used.
99	Define neither one if an assembler-language alloca
100	in the file alloca.s should be used. */
101
102	#define C_ALLOCA
103	/* #define HAVE_ALLOCA */
104
105	/* Define NO_REMAP if memory segmentation makes it not work well
106	to change the boundary between the text section and data section
107	when Emacs is dumped. If you define this, the preloaded Lisp
108	code will not be sharable; but that's better than failing completely. */
109
110	#define NO_REMAP
111
112	/* This machine requires completely different unexec code
113	which lives in a separate file. Specify the file name. */
114
115	#ifdef UNEXEC
116	#undef UNEXEC
117	#endif
118	#define UNEXEC unexelf.o
119
120	#define TEXT_START 0x400000
121
122	/*
123	* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
124	* were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
125	* the value field of a LISP_OBJECT).
126	*/
127
128	#define DATA_START 0x10000000
129	#define DATA_SEG_BITS 0x10000000
130
131	#undef LIBS_MACHINE
132	/* -lsun in case using Yellow Pages for passwords. */
133	#if defined(__GNUC__) && defined(_ABIN32)
134	#define LIBS_MACHINE -lsun
135	#else
136	#define LIBS_MACHINE -lsun -lmld
137	#endif
138
139	#define LIBS_DEBUG
140
141	/* Define this if you have a fairly recent system,
142	in which crt1.o and crt1.n should be used. */
143	#define HAVE_CRTN
144
145	#ifdef HAVE_CRTN
146	/* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */
147	#define START_FILES pre-crt0.o /usr/lib/crt1.o
148	#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o
149	#else
150	#define START_FILES pre-crt0.o /usr/lib/crt0.o
151	/* The entry-point label (start of text segment) is `start', not `__start'. */
152	#define DEFAULT_ENTRY_ADDRESS start
153	#define LIB_STANDARD -lbsd -lc
154	#endif
155
156	/* Use terminfo instead of termcap. */
157
158	#define TERMINFO
159
160	/* sioctl.h should be included where appropriate. */
161
162	#define NEED_SIOCTL
163
164	/* Letter to use in finding device name of first pty,
165	if system supports pty's. 'a' means it is /dev/ptya0 */
166
167	#undef FIRST_PTY_LETTER
168	#define FIRST_PTY_LETTER 'q'
169
170	/* Define STACK_DIRECTION for alloca.c */
171
172	#define STACK_DIRECTION -1
173
174	/* The standard definitions of these macros would work ok,
175	but these are faster because the constants are short. */
176
177	#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
178
179	#define XSET(var, type, ptr) \
180	((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
181
182	#define XMARKBIT(a) ((a) < 0)
183	#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) \| ((b) ? MARKBIT : 0))
184	#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
185
186	#ifndef __GNUC__
187	/* Turn off some "helpful" error checks for type mismatches
188	that we can't fix without breaking other machines. */
189	#define C_SWITCH_MACHINE -cckr
190	#endif