aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2008-02-24 18:53:07 +0000
committerDan Nicolaescu2008-02-24 18:53:07 +0000
commit9d2818d67690523a462696ccef3e1376a57dbf43 (patch)
treeb94f1aa78265a5ef22ed37d365dda1b36d653748 /src
parent5cd53af59e1e907956a751a62c72abce85d4ab5a (diff)
downloademacs-9d2818d67690523a462696ccef3e1376a57dbf43.tar.gz
emacs-9d2818d67690523a462696ccef3e1376a57dbf43.zip
* configure.in: Remove references to obsolete variables and
systems. * configure: Regenerate. * Makefile.in (NO_SHORTNAMES): * emacsclient.c (NO_SHORTNAMES): * fakemail.c (NO_SHORTNAMES): * make-docfile.c (NO_SHORTNAMES): * movemail.c (NO_SHORTNAMES): * pop.c (NO_SHORTNAMES): Remove references to obsolete variable. * config.nt (SHORTNAMES): Remove reference to obsolete variable. * s/vms4-0.h: * s/vms4-2.h: * s/vms4-4.h: * s/vms5-5.h: Remove, unused. * s/irix5-2.h: * s/irix6-0.h: * s/riscos5.h: * s/mach-bsd4-3.h: * m/mips4.h: Remove files for obsolete systems * Makefile.in: * filelock.c: * unexmips.c: * m/hp9000s300.h: * m/iris4d.h: * s/aix3-1.h: * s/hpux.h: * s/msdos.h: * s/usg5-0.h: * s/usg5-2-2.h: * s/usg5-2.h: * s/usg5-3.h: Remove references to obsolete variables. * s/irix5-0.h: Remove, move all the contents ... * s/irix6-5.h: ... here. Simplify. * config.in: Regenerate.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog30
-rw-r--r--src/Makefile.in1
-rw-r--r--src/config.in11
-rw-r--r--src/filelock.c4
-rw-r--r--src/m/hp9000s300.h14
-rw-r--r--src/m/iris4d.h24
-rw-r--r--src/m/mips4.h83
-rw-r--r--src/s/aix3-1.h6
-rw-r--r--src/s/hpux.h10
-rw-r--r--src/s/irix5-0.h141
-rw-r--r--src/s/irix5-2.h21
-rw-r--r--src/s/irix6-0.h63
-rw-r--r--src/s/irix6-5.h117
-rw-r--r--src/s/mach-bsd4-3.h8
-rw-r--r--src/s/msdos.h2
-rw-r--r--src/s/riscos5.h14
-rw-r--r--src/s/usg5-0.h6
-rw-r--r--src/s/usg5-2-2.h6
-rw-r--r--src/s/usg5-2.h6
-rw-r--r--src/s/usg5-3.h6
-rw-r--r--src/s/vms4-0.h5
-rw-r--r--src/s/vms4-2.h5
-rw-r--r--src/s/vms4-4.h7
-rw-r--r--src/s/vms5-5.h13
-rw-r--r--src/unexmips.c15
25 files changed, 138 insertions, 480 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dda7a11fdaa..928a2d9fd42 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
12008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * s/vms4-0.h:
4 * s/vms4-2.h:
5 * s/vms4-4.h:
6 * s/vms5-5.h: Remove, unused.
7
8 * s/irix5-2.h:
9 * s/irix6-0.h:
10 * s/riscos5.h:
11 * s/mach-bsd4-3.h:
12 * m/mips4.h: Remove files for obsolete systems
13
14 * Makefile.in:
15 * filelock.c:
16 * unexmips.c:
17 * m/hp9000s300.h:
18 * m/iris4d.h:
19 * s/aix3-1.h:
20 * s/hpux.h:
21 * s/msdos.h:
22 * s/usg5-0.h:
23 * s/usg5-2-2.h:
24 * s/usg5-2.h:
25 * s/usg5-3.h: Remove references to obsolete variables.
26
27 * s/irix5-0.h: Remove, move all the contents ...
28 * s/irix6-5.h: ... here. Simplify.
29 * config.in: Regenerate.
30
12008-02-24 Jason Rumney <jasonr@gnu.org> 312008-02-24 Jason Rumney <jasonr@gnu.org>
2 32
3 * w32term.c: (x_draw_glyph_string_background): Clear the background 33 * w32term.c: (x_draw_glyph_string_background): Clear the background
diff --git a/src/Makefile.in b/src/Makefile.in
index 4a572a57873..6113e3e8e16 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -78,7 +78,6 @@ C_SWITCH_SYSTEM=
78SHELL=/bin/sh 78SHELL=/bin/sh
79 79
80#define THIS_IS_MAKEFILE 80#define THIS_IS_MAKEFILE
81#define NO_SHORTNAMES
82#define NOT_C_CODE 81#define NOT_C_CODE
83#include "config.h" 82#include "config.h"
84 83
diff --git a/src/config.in b/src/config.in
index 244b4cf93d0..f0939d33830 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1003,17 +1003,6 @@ Boston, MA 02110-1301, USA. */
1003#include config_opsysfile 1003#include config_opsysfile
1004#include config_machfile 1004#include config_machfile
1005 1005
1006/* Load in the conversion definitions if this system
1007 needs them and the source file being compiled has not
1008 said to inhibit this. There should be no need for you
1009 to alter these lines. */
1010
1011#ifdef SHORTNAMES
1012#ifndef NO_SHORTNAMES
1013#include "../shortnames/remap.h"
1014#endif /* not NO_SHORTNAMES */
1015#endif /* SHORTNAMES */
1016
1017/* If no remapping takes place, static variables cannot be dumped as 1006/* If no remapping takes place, static variables cannot be dumped as
1018 pure, so don't worry about the `static' keyword. */ 1007 pure, so don't worry about the `static' keyword. */
1019#ifdef NO_REMAP 1008#ifdef NO_REMAP
diff --git a/src/filelock.c b/src/filelock.c
index fc1c974c44e..194df81ee8a 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -130,7 +130,7 @@ static void get_boot_time_1 P_ ((char *, int));
130static time_t 130static time_t
131get_boot_time () 131get_boot_time ()
132{ 132{
133#if defined (BOOT_TIME) && ! defined (NO_WTMP_FILE) 133#if defined (BOOT_TIME)
134 int counter; 134 int counter;
135#endif 135#endif
136 136
@@ -166,7 +166,7 @@ get_boot_time ()
166 } 166 }
167 } 167 }
168 168
169#if defined (BOOT_TIME) && ! defined (NO_WTMP_FILE) 169#if defined (BOOT_TIME)
170#ifndef CANNOT_DUMP 170#ifndef CANNOT_DUMP
171 /* The utmp routines maintain static state. 171 /* The utmp routines maintain static state.
172 Don't touch that state unless we are initialized, 172 Don't touch that state unless we are initialized,
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index b44b14e17d3..0c52b96531c 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -35,20 +35,6 @@ HP 9000 series 200 or 300 (-machine=hp9000s300)
35NOTE-END */ 35NOTE-END */
36 36
37/* I don't understand why we have to do this at all! -JimB */ 37/* I don't understand why we have to do this at all! -JimB */
38#if 0
39
40/* Do this here at the top of the file; including sys/wait.h may
41 include <endian.h>, which defines BIG_ENDIAN, which will conflict
42 with our definition of BIG_ENDIAN if we do this at the bottom. */
43#ifndef NOT_C_CODE
44#ifndef NO_SHORTNAMES
45#include <sys/wait.h>
46#define WAITTYPE int
47#endif
48#define WRETCODE(w) (((w) >> 8) & 0377)
49#endif
50
51#endif
52 38
53/* Define NOMULTIPLEJOBS on versions of HPUX before 6.5. */ 39/* Define NOMULTIPLEJOBS on versions of HPUX before 6.5. */
54 40
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e22f7843214..23185641780 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -121,16 +121,7 @@ Boston, MA 02110-1301, USA. */
121#define DATA_SEG_BITS 0x10000000 121#define DATA_SEG_BITS 0x10000000
122 122
123#undef LIBS_MACHINE 123#undef LIBS_MACHINE
124/* -lsun in case using Yellow Pages for passwords. */
125#if defined(__GNUC__) && defined(_ABIN32)
126#define LIBS_MACHINE 124#define LIBS_MACHINE
127#else
128#ifndef IRIX6_5
129#define LIBS_MACHINE -lmld
130#else
131#define LIBS_MACHINE
132#endif
133#endif
134#define LIBS_DEBUG 125#define LIBS_DEBUG
135 126
136/* Define this if you have a fairly recent system, 127/* Define this if you have a fairly recent system,
@@ -173,20 +164,5 @@ Boston, MA 02110-1301, USA. */
173 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) 164 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
174#endif /* _LP64 */ 165#endif /* _LP64 */
175 166
176#ifndef __GNUC__
177/* Turn off some "helpful" error checks for type mismatches
178 that we can't fix without breaking other machines. */
179#ifdef IRIX_FORCE_32_BITS
180#ifdef THIS_IS_MAKEFILE
181#ifndef IRIX6_5
182#define C_SWITCH_MACHINE -32
183#else
184#define C_SWITCH_MACHINE -n32
185#endif
186#endif
187#endif
188
189#endif /* not __GNUC__ */
190
191/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6 167/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
192 (do not change this comment) */ 168 (do not change this comment) */
diff --git a/src/m/mips4.h b/src/m/mips4.h
deleted file mode 100644
index 3151ed7bcaf..00000000000
--- a/src/m/mips4.h
+++ /dev/null
@@ -1,83 +0,0 @@
1/* machine description file for Mips running RISCOS version 4.
2
3 Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
4 2007, 2008 Free Software Foundation, Inc.
5
6This file is part of GNU Emacs.
7
8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 3, or (at your option)
11any later version.
12
13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with GNU Emacs; see the file COPYING. If not, write to
20the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21Boston, MA 02110-1301, USA. */
22
23
24#include "mips.h"
25
26/* The following line tells the configuration script what sort of
27 operating system this machine is likely to run.
28 USUAL-OPSYS="note"
29
30NOTE-START
31Use -opsystem=usg5-2-2 normally, or -opsystem=bsd4-3 with the BSD
32world.
33NOTE-END */
34
35#if 0
36/* Define MIPS2 if you have an R6000 or R4000. */
37#define MIPS2
38#endif
39
40#ifdef __GNUC__
41#define C_DEBUG_SWITCH -g -O
42#else
43/* We used to have -systype bsd43, but a configure change
44 now takes care of that option. */
45#ifdef MIPS2
46#define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000 -mips2
47#else
48#define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000
49#endif
50#endif
51
52#ifdef TERMINFO
53#undef TERMINFO
54#endif
55
56#define START_FILES pre-crt0.o /lib/crt1.o
57/* Used to have -lisode, but jlp@math.byu.edu says remove it
58 (for RISCOS 4.52). */
59/* ethanb@ptolemy.astro.washington.edu says crtn.o uses _ctype
60 and therefore we must search libc again after crtn.o.
61 The -L is used to force second -lc to find the sysv version
62 of libc.a, which is needed because the BSD libc.a
63 doesn't have _ctype. */
64#define LIB_STANDARD -lmld -lc /lib/crtn.o -L/usr/lib -lc
65
66
67#define COFF
68#undef LD_SWITCH_MACHINE
69#define LD_SWITCH_MACHINE -systype bsd43 -g3 -D 800000
70
71#define NO_MODE_T
72
73/* These are needed on Riscos 4.0.
74 It appears that's the only system which uses mips4.h and defines BSD. */
75#ifdef BSD_SYSTEM
76#undef HAVE_STRERROR
77#undef HAVE_XRMSETDATABASE
78#undef HAVE_XSCREENRESOURCESTRING
79#undef HAVE_SETSID
80#endif
81
82/* arch-tag: 56050454-0df5-4de9-b1b7-0c6ab400313c
83 (do not change this comment) */
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index fe09df5f516..50368cf86a5 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -134,12 +134,6 @@ Boston, MA 02110-1301, USA. */
134 134
135/* #define CLASH_DETECTION */ 135/* #define CLASH_DETECTION */
136 136
137/* Define SHORTNAMES if the C compiler can distinguish only
138 short names. It means that the stuff in ../shortnames
139 must be run to convert the long names to short ones. */
140
141/* #define SHORTNAMES */
142
143/* The file containing the kernel's symbol table is called /unix. */ 137/* The file containing the kernel's symbol table is called /unix. */
144 138
145#define KERNEL_FILE "/unix" 139#define KERNEL_FILE "/unix"
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 1a9b2b8489f..fd8bf927f94 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -115,16 +115,6 @@ Boston, MA 02110-1301, USA. */
115 115
116#define CLASH_DETECTION 116#define CLASH_DETECTION
117 117
118/* Define SHORTNAMES if the C compiler can distinguish only
119 short names. It means that the stuff in ../shortnames
120 must be run to convert the long names to short ones.
121
122 Some USG systems support long names.
123 If yours is one, DO NOT change this file!
124 Do #undef SHORTNAMES in the m- file or in config.h. */
125
126/* #define SHORTNAMES */
127
128/* The file containing the kernel's symbol table is called /hp-ux. */ 118/* The file containing the kernel's symbol table is called /hp-ux. */
129 119
130#define KERNEL_FILE "/hp-ux" 120#define KERNEL_FILE "/hp-ux"
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
deleted file mode 100644
index 2d126ff5fd9..00000000000
--- a/src/s/irix5-0.h
+++ /dev/null
@@ -1,141 +0,0 @@
1/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 5.0.
2
3 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
4 2007, 2008 Free Software Foundation, Inc.
5
6This file is part of GNU Emacs.
7
8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 3, or (at your option)
11any later version.
12
13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with GNU Emacs; see the file COPYING. If not, write to
20the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21Boston, MA 02110-1301, USA. */
22
23
24#include "usg5-4.h"
25
26#define IRIX5
27
28#undef sigsetmask /* use sys_sigsetmask */
29#undef _longjmp /* use system versions, not conservative aliases */
30#undef _setjmp
31
32#define SETPGRP_RELEASES_CTTY
33
34#ifdef LIBS_SYSTEM
35#undef LIBS_SYSTEM
36#endif
37
38#ifdef LIB_STANDARD
39#undef LIB_STANDARD
40#endif
41
42#ifdef SYSTEM_TYPE
43#undef SYSTEM_TYPE
44#endif
45#define SYSTEM_TYPE "irix"
46
47#ifdef SETUP_SLAVE_PTY
48#undef SETUP_SLAVE_PTY
49#endif
50
51/* thomas@mathematik.uni-bremen.de says this is needed. */
52/* Make process_send_signal work by "typing" a signal character on the pty. */
53#define SIGNALS_VIA_CHARACTERS
54
55/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
56 because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead
57 we'll just define WNOHANG right here.
58 (An implicit decl is good enough for wait3.) */
59
60/* #define WNOHANG 0x1 */
61
62/* No need to use sprintf to get the tty name--we get that from _getpty. */
63#ifdef PTY_TTY_NAME_SPRINTF
64#undef PTY_TTY_NAME_SPRINTF
65#endif
66#define PTY_TTY_NAME_SPRINTF
67/* No need to get the pty name at all. */
68#ifdef PTY_NAME_SPRINTF
69#undef PTY_NAME_SPRINTF
70#endif
71#define PTY_NAME_SPRINTF
72#ifdef emacs
73char *_getpty();
74#endif
75/* We need only try once to open a pty. */
76#define PTY_ITERATION
77/* Here is how to do it. */
78#define PTY_OPEN \
79{ \
80 struct sigaction ocstat, cstat; \
81 char * name; \
82 sigemptyset(&cstat.sa_mask); \
83 cstat.sa_handler = SIG_DFL; \
84 cstat.sa_flags = 0; \
85 sigaction(SIGCLD, &cstat, &ocstat); \
86 name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); \
87 sigaction(SIGCLD, &ocstat, (struct sigaction *)0); \
88 if (name == 0) \
89 return -1; \
90 if (fd < 0) \
91 return -1; \
92 if (fstat (fd, &stb) < 0) \
93 return -1; \
94 strcpy (pty_name, name); \
95}
96
97/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
98 throughout. */
99#define POSIX_SIGNALS
100
101/* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */
102#define GETPGRP_NO_ARG
103
104/* Ulimit(UL_GMEMLIM) is busted... */
105#define ULIMIT_BREAK_VALUE 0x14000000
106
107/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
108#define PREFER_VSUSP
109
110/* define MAIL_USE_FLOCK if the mailer uses flock
111 to interlock access to /usr/spool/mail/$USER.
112 The alternative is that a lock file named
113 /usr/spool/mail/$USER.lock. */
114
115#define MAIL_USE_FLOCK
116
117/* use K&R C */
118#if 0
119#ifndef __GNUC__
120#define C_SWITCH_SYSTEM -cckr
121#endif
122#endif
123
124/* -g used not to work on Irix unless you used gas, and since gcc
125 warns if you use it, turn off the warning. */
126/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
127 I'm not sure about Irix 5 -- fx */
128#ifdef __GNUC__
129#define C_DEBUG_SWITCH
130#endif
131
132/* Prevent the variable ospeed from being defined by -lcurses
133 because it defines it with too few bytes. */
134#define ospeed ospeed_
135
136#define NARROWPROTO 1
137
138#define USE_MMAP_FOR_BUFFERS 1
139
140/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
141 (do not change this comment) */
diff --git a/src/s/irix5-2.h b/src/s/irix5-2.h
deleted file mode 100644
index b9cca67acdf..00000000000
--- a/src/s/irix5-2.h
+++ /dev/null
@@ -1,21 +0,0 @@
1#include "irix5-0.h"
2
3/* as of version 5.2, irix no longer uses flock,
4 according to jackr@wpd.sgi.com. */
5#undef MAIL_USE_FLOCK
6
7/* C-g in select is not handled properly with restartable
8 system calls. So don't use them. */
9#undef SA_RESTART
10
11/* schoepf@goofy.zdv.Uni-Mainz.de reports he needed -lw with X11R6
12 on Irix 5.3. I don't know which Irix version that need starts with. */
13#define NEED_LIBW
14
15/* Looking at the wtmp file in filelock.c causes a crash
16 for jpff@maths.bath.ac.uk.
17 Note that irix6-0.h does not include this file, only irix5-0.h. */
18#define NO_WTMP_FILE
19
20/* arch-tag: e2f820c1-2a3e-4cee-b5f1-6ce8ab21f439
21 (do not change this comment) */
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
deleted file mode 100644
index 00c948ce1ec..00000000000
--- a/src/s/irix6-0.h
+++ /dev/null
@@ -1,63 +0,0 @@
1/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.0.
2
3Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
4 2007, 2008 Free Software Foundation, Inc.
5
6This file is part of GNU Emacs.
7
8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 3, or (at your option)
11any later version.
12
13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with GNU Emacs; see the file COPYING. If not, write to
20the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21Boston, MA 02110-1301, USA. */
22
23
24#include "irix5-0.h"
25
26/* Irix 6 tries to do 64 bits, but doesn't do it fully,
27 so inhibit that. */
28#define IRIX_FORCE_32_BITS
29
30#ifndef __GNUC__
31#define LD_SWITCH_SYSTEM -32
32#endif
33
34/* This macro definition, which we inherited from irix5-0.h,
35 is needed in configure on Irix 5, but gets in the way there
36 on Irix 6. So get rid of it except in Makefile.in where we need it. */
37#ifndef THIS_IS_MAKEFILE
38#undef C_SWITCH_SYSTEM
39#endif
40
41/* The only supported 32-bit configuration of GCC under IRIX6.x produces
42 n32 MIPS ABI binaries and also supports -g. */
43#ifdef __GNUC__
44#undef C_DEBUG_SWITCH
45#define C_DEBUG_SWITCH -g
46#endif
47
48#undef SA_RESTART
49
50/* It turns out that the #define in irix5-0.h is needed in Irix 6 as well. */
51#if 0
52/* Cancel the #define that is in irix5-0.h. */
53#undef ospeed
54#endif
55
56#undef TIOCSIGSEND
57
58/* Tested on Irix 6.5. SCM worked on earlier versions. */
59#define GC_SETJMP_WORKS 1
60#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
61
62/* arch-tag: a775e465-a619-4655-a58f-5982aad0c624
63 (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 537e7975623..d676e13ec7a 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -22,19 +22,117 @@ Boston, MA 02110-1301, USA. */
22 22
23 23
24#define IRIX6_5 /* used in m/iris4d */ 24#define IRIX6_5 /* used in m/iris4d */
25#include "irix5-0.h" 25#include "usg5-4.h"
26
27#undef sigsetmask /* use sys_sigsetmask */
28#undef _longjmp /* use system versions, not conservative aliases */
29#undef _setjmp
30
31#define SETPGRP_RELEASES_CTTY
32
33#ifdef LIBS_SYSTEM
34#undef LIBS_SYSTEM
35#endif
36
37#ifdef LIB_STANDARD
38#undef LIB_STANDARD
39#endif
40
41#ifdef SYSTEM_TYPE
42#undef SYSTEM_TYPE
43#endif
44#define SYSTEM_TYPE "irix"
45
46#ifdef SETUP_SLAVE_PTY
47#undef SETUP_SLAVE_PTY
48#endif
49
50/* thomas@mathematik.uni-bremen.de says this is needed. */
51/* Make process_send_signal work by "typing" a signal character on the pty. */
52#define SIGNALS_VIA_CHARACTERS
53
54/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
55 because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead
56 we'll just define WNOHANG right here.
57 (An implicit decl is good enough for wait3.) */
58
59/* #define WNOHANG 0x1 */
60
61/* No need to use sprintf to get the tty name--we get that from _getpty. */
62#ifdef PTY_TTY_NAME_SPRINTF
63#undef PTY_TTY_NAME_SPRINTF
64#endif
65#define PTY_TTY_NAME_SPRINTF
66/* No need to get the pty name at all. */
67#ifdef PTY_NAME_SPRINTF
68#undef PTY_NAME_SPRINTF
69#endif
70#define PTY_NAME_SPRINTF
71#ifdef emacs
72char *_getpty();
73#endif
74/* We need only try once to open a pty. */
75#define PTY_ITERATION
76/* Here is how to do it. */
77#define PTY_OPEN \
78{ \
79 struct sigaction ocstat, cstat; \
80 char * name; \
81 sigemptyset(&cstat.sa_mask); \
82 cstat.sa_handler = SIG_DFL; \
83 cstat.sa_flags = 0; \
84 sigaction(SIGCLD, &cstat, &ocstat); \
85 name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); \
86 sigaction(SIGCLD, &ocstat, (struct sigaction *)0); \
87 if (name == 0) \
88 return -1; \
89 if (fd < 0) \
90 return -1; \
91 if (fstat (fd, &stb) < 0) \
92 return -1; \
93 strcpy (pty_name, name); \
94}
95
96/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
97 throughout. */
98#define POSIX_SIGNALS
99
100/* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */
101#define GETPGRP_NO_ARG
102
103/* Ulimit(UL_GMEMLIM) is busted... */
104#define ULIMIT_BREAK_VALUE 0x14000000
105
106/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
107#define PREFER_VSUSP
108
109/* define MAIL_USE_FLOCK if the mailer uses flock
110 to interlock access to /usr/spool/mail/$USER.
111 The alternative is that a lock file named
112 /usr/spool/mail/$USER.lock. */
113
114#define MAIL_USE_FLOCK
115
116/* -g used not to work on Irix unless you used gas, and since gcc
117 warns if you use it, turn off the warning. */
118/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
119 I'm not sure about Irix 5 -- fx */
120#ifdef __GNUC__
121#define C_DEBUG_SWITCH
122#endif
123
124#define NARROWPROTO 1
125
126#define USE_MMAP_FOR_BUFFERS 1
127
128/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
129 (do not change this comment) */
130
26 131
27#if _MIPS_SZLONG == 64 /* -mabi=64 (gcc) or -64 (MIPSpro) */ 132#if _MIPS_SZLONG == 64 /* -mabi=64 (gcc) or -64 (MIPSpro) */
28#define _LP64 /* lisp.h takes care of the rest */ 133#define _LP64 /* lisp.h takes care of the rest */
29#endif /* _MIPS_SZLONG */ 134#endif /* _MIPS_SZLONG */
30 135
31/* This macro definition, which we inherited from irix5-0.h,
32 is needed in configure on Irix 5, but gets in the way there
33 on Irix 6. So get rid of it except in Makefile.in where we need it. */
34#ifndef THIS_IS_MAKEFILE
35#undef C_SWITCH_SYSTEM
36#endif
37
38/* The only supported 32-bit configuration of GCC under IRIX6.x produces 136/* The only supported 32-bit configuration of GCC under IRIX6.x produces
39 n32 MIPS ABI binaries and also supports -g. */ 137 n32 MIPS ABI binaries and also supports -g. */
40#ifdef __GNUC__ 138#ifdef __GNUC__
@@ -51,9 +149,6 @@ Boston, MA 02110-1301, USA. */
51 149
52#undef SA_RESTART 150#undef SA_RESTART
53 151
54/* Cancel the #define that is in irix5-0.h. */
55#undef ospeed
56
57#undef TIOCSIGSEND /* defined in usg5-4.h */ 152#undef TIOCSIGSEND /* defined in usg5-4.h */
58 153
59/* Tested on Irix 6.5. SCM worked on earlier versions. */ 154/* Tested on Irix 6.5. SCM worked on earlier versions. */
diff --git a/src/s/mach-bsd4-3.h b/src/s/mach-bsd4-3.h
deleted file mode 100644
index e012679c5ff..00000000000
--- a/src/s/mach-bsd4-3.h
+++ /dev/null
@@ -1,8 +0,0 @@
1/* I don't care if this doesn't do more than including bsd4-3.h;
2 Mach is not bsd4-3 and the moment you forget it chances are that
3 you're in deep shit. */
4
5#include "bsd4-3.h"
6
7/* arch-tag: 7f7f00f6-ae34-413e-9e6a-1d3b3e3d07e8
8 (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 61289fdc2c0..21c0eaf4309 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -160,8 +160,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
160 160
161#if __DJGPP__ < 2 161#if __DJGPP__ < 2
162 162
163#define NO_MODE_T
164
165/* New chdir () routine. 163/* New chdir () routine.
166 DJGPP v2.0 and later doesn't need it because its chdir() does 164 DJGPP v2.0 and later doesn't need it because its chdir() does
167 set the drive itself. */ 165 set the drive itself. */
diff --git a/src/s/riscos5.h b/src/s/riscos5.h
deleted file mode 100644
index 6ebf412c1d6..00000000000
--- a/src/s/riscos5.h
+++ /dev/null
@@ -1,14 +0,0 @@
1#include "bsd4-3.h"
2
3/* This file has changes that Jost Krieger <x920031@rubb.rz.ruhr-uni-bochum.de>
4 says are necessary. */
5
6/* No declaration in system header files. */
7extern double atof ();
8
9#define LD_SWITCH_SYSTEM -non_shared
10
11#define GETPGRP_NO_ARG
12
13/* arch-tag: e8ddf21d-72a0-476d-b33e-364f8b20e3b7
14 (do not change this comment) */
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 652b6a862f9..9b4aad53671 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -103,12 +103,6 @@ Boston, MA 02110-1301, USA. */
103 103
104/* #define CLASH_DETECTION */ 104/* #define CLASH_DETECTION */
105 105
106/* Define SHORTNAMES if the C compiler can distinguish only
107 short names. It means that the stuff in ../shortnames
108 must be run to convert the long names to short ones. */
109
110#define SHORTNAMES
111
112/* The file containing the kernel's symbol table is called /unix. */ 106/* The file containing the kernel's symbol table is called /unix. */
113 107
114#define KERNEL_FILE "/unix" 108#define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index 6f80b7fc41e..a76c0294394 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */
102 102
103/* #define CLASH_DETECTION */ 103/* #define CLASH_DETECTION */
104 104
105/* Define SHORTNAMES if the C compiler can distinguish only
106 short names. It means that the stuff in ../shortnames
107 must be run to convert the long names to short ones. */
108
109/* #define SHORTNAMES */
110
111/* The file containing the kernel's symbol table is called /unix. */ 105/* The file containing the kernel's symbol table is called /unix. */
112 106
113#define KERNEL_FILE "/unix" 107#define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 1d4bf597fd2..ad2f2aeef35 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */
102 102
103/* #define CLASH_DETECTION */ 103/* #define CLASH_DETECTION */
104 104
105/* Define SHORTNAMES if the C compiler can distinguish only
106 short names. It means that the stuff in ../shortnames
107 must be run to convert the long names to short ones. */
108
109/* #define SHORTNAMES */
110
111/* The file containing the kernel's symbol table is called /unix. */ 105/* The file containing the kernel's symbol table is called /unix. */
112 106
113#define KERNEL_FILE "/unix" 107#define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index f518ee96b8d..0974f6ced8c 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -113,12 +113,6 @@ Boston, MA 02110-1301, USA. */
113 113
114/* #define CLASH_DETECTION */ 114/* #define CLASH_DETECTION */
115 115
116/* Define SHORTNAMES if the C compiler can distinguish only
117 short names. It means that the stuff in ../shortnames
118 must be run to convert the long names to short ones. */
119
120/* #define SHORTNAMES */
121
122/* The file containing the kernel's symbol table is called /unix. */ 116/* The file containing the kernel's symbol table is called /unix. */
123 117
124#define KERNEL_FILE "/unix" 118#define KERNEL_FILE "/unix"
diff --git a/src/s/vms4-0.h b/src/s/vms4-0.h
deleted file mode 100644
index c7e0c7be585..00000000000
--- a/src/s/vms4-0.h
+++ /dev/null
@@ -1,5 +0,0 @@
1#include "vms.h"
2#define VMS4_0
3
4/* arch-tag: 734e1c69-d514-4441-bbcd-8b5db8ab1892
5 (do not change this comment) */
diff --git a/src/s/vms4-2.h b/src/s/vms4-2.h
deleted file mode 100644
index 01ee788dd66..00000000000
--- a/src/s/vms4-2.h
+++ /dev/null
@@ -1,5 +0,0 @@
1#include "vms.h"
2#define VMS4_2
3
4/* arch-tag: d9ff67bc-a899-44b2-a618-a73c821bb559
5 (do not change this comment) */
diff --git a/src/s/vms4-4.h b/src/s/vms4-4.h
deleted file mode 100644
index 7491f5c8f80..00000000000
--- a/src/s/vms4-4.h
+++ /dev/null
@@ -1,7 +0,0 @@
1#include "vms.h"
2#define VMS4_4
3
4#undef NO_HYPHENS_IN_FILENAMES
5
6/* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
7 (do not change this comment) */
diff --git a/src/s/vms5-5.h b/src/s/vms5-5.h
deleted file mode 100644
index 83b08b42813..00000000000
--- a/src/s/vms5-5.h
+++ /dev/null
@@ -1,13 +0,0 @@
1#include "vms.h"
2#define VMS5_5
3#define VMS4_4
4
5#undef NO_HYPHENS_IN_FILENAMES
6
7/* The bug that SHARABLE_LIB_BUG fixes is gone in version 5.5 of VMS.
8 And defining it causes lossage because sys_errlist has a different
9 number of elements. */
10#undef SHARABLE_LIB_BUG
11
12/* arch-tag: 92acc416-61fe-44ae-b0e0-710cb9e38ec6
13 (do not change this comment) */
diff --git a/src/unexmips.c b/src/unexmips.c
index 7c52e9aa7e4..ef8754fdd6d 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -149,20 +149,6 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
149 if (new < 0) fatal_unexec ("creating %s", new_name); 149 if (new < 0) fatal_unexec ("creating %s", new_name);
150 150
151 hdr = *((struct headers *)TEXT_START); 151 hdr = *((struct headers *)TEXT_START);
152#ifdef MIPS2
153 if (hdr.fhdr.f_magic != MIPSELMAGIC
154 && hdr.fhdr.f_magic != MIPSEBMAGIC
155 && hdr.fhdr.f_magic != (MIPSELMAGIC | 1)
156 && hdr.fhdr.f_magic != (MIPSEBMAGIC | 1))
157 {
158 fprintf (stderr,
159 "unexec: input file magic number is %x, not %x, %x, %x or %x.\n",
160 hdr.fhdr.f_magic,
161 MIPSELMAGIC, MIPSEBMAGIC,
162 MIPSELMAGIC | 1, MIPSEBMAGIC | 1);
163 exit(1);
164 }
165#else /* not MIPS2 */
166 if (hdr.fhdr.f_magic != MIPSELMAGIC 152 if (hdr.fhdr.f_magic != MIPSELMAGIC
167 && hdr.fhdr.f_magic != MIPSEBMAGIC) 153 && hdr.fhdr.f_magic != MIPSEBMAGIC)
168 { 154 {
@@ -170,7 +156,6 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
170 hdr.fhdr.f_magic, MIPSELMAGIC, MIPSEBMAGIC); 156 hdr.fhdr.f_magic, MIPSELMAGIC, MIPSEBMAGIC);
171 exit (1); 157 exit (1);
172 } 158 }
173#endif /* not MIPS2 */
174 if (hdr.fhdr.f_opthdr != sizeof (hdr.aout)) 159 if (hdr.fhdr.f_opthdr != sizeof (hdr.aout))
175 { 160 {
176 fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n", 161 fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n",
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-28 17:42:36 +0000