* unexnext.c:

* m/ews4800.h:
* m/hp9000s300.h:
* m/ibm370aix.h:
* m/mips-siemens.h:
* m/ncr386.h:
* m/next.h:
* m/pmax.h:
* m/powerpcle.h:
* m/tandem-s2.h:
* s/386bsd.h:
* s/bsd386.h:
* s/bsd4-1.h:
* s/bsd4-2.h:
* s/bsdos2-1.h:
* s/bsdos2.h:
* s/bsdos3.h:
* s/bsdos4.h:
* s/nextstep.h:
* s/ultrix4-3.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-4-3.h:
* s/ux4800.h:
* s/uxpds.h:
* s/uxpv.h: Remove support for obsolete systems.
* s/hpux.h, s/hpux10.h, s/hpux8.h, s/hpux9.h, s/hpux9shr.h:
Remove, insert contents in s/hpux-10.20.h
* s/aix3-1.h, s/aix3-2-5.h, s/aix3-2.h, s/aix4-1.h, s/aix4.h:
Remove, insert contents in s/aix-4.2.h
* s/usg5-3.h: Remove, insert contents in s/usg5-4.h.
* s/bsd4-3.h: Rename to ..
* s/bsd-common.h: ... this.
* src/data.c:
* src/doc.c:
* src/ecrt0.c:
* src/emacs.c:
* src/fileio.c:
* src/floatfns.c:
* src/keyboard.c:
* src/mem-limits.h:
* src/print.c:
* src/process.c:
* src/sysdep.c:
* src/syssignal.h:
* src/systty.h:
* src/syswait.h:
* src/term.c:
* src/unexec.c:
* src/unexelf.c:
* src/unexhp9k800.c:
* src/m/hp800.h:
* src/m/ibmrs6000.h:
* src/m/mips.h:
* src/m/vax.h:
* src/s/darwin.h:
* src/s/freebsd.h:
* src/s/gnu.h:
* src/s/ms-w32.h:
* src/s/msdos.h:
* src/s/netbsd.h:
* src/s/template.h: Remove references to obsolete variables.

* Makefile.in: Add dependencies for all unexec files.
(admindir): Remove unused variable.
(UNEXEC_SRC): Remove references.

* config.nt: Remove reference to UNEXEC_SRC.

* lwlib.c: Remove references to obsolete variables.

* fakemail.c: Remove references to obsolete variables.

* os.texi: Remove references to obsolete systems.

* configure.in:
* configure: Remove references to obsolete systems.

13 files changed, 5 insertions, 841 deletions

diff --git a/src/m/ews4800.h b/src/m/ews4800.h
deleted file mode 100644
index 5badc7ecf1a..00000000000
--- a/src/m/ews4800.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* m- file for NEC EWS4800 RISC series.
-   Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008  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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#undef LIB_STANDARD
-#undef C_DEBUG_SWITCH
-#define INHIBIT_BSD_TIME
-#undef USG
-#include "mips.h"
-#define USG
-#undef UNEXEC
-#define UNEXEC unexelf.o
-#undef LIBS_MACHINE
-#undef LD_SWITCH_MACHINE
-#undef START_FILES
-#undef DATA_START
-#undef LIB_STANDARD
-#undef C_SWITCH_MACHINE
-#ifndef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -O  -KOlimit=3000 -ZXNd=5000
-#endif  /* !__GNUC__ */
-
-/* arch-tag: 27f72f54-45cd-40a3-b182-345127f04955
-   (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 28d7e4d7371..1a1a6abc465 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -62,13 +62,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Common definitions for HPUX and GNU/Linux.  */
 
 #if defined (__hpux) || defined (GNU_LINUX)
-/* 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 hp9000s800
-#     define hp9000s800
-#endif
 
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
deleted file mode 100644
index d7fb8b4015a..00000000000
--- a/src/m/hp9000s300.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008  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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-HP 9000 series 200 or 300 (-machine=hp9000s300)
-
-  These machines are 68000-series CPUs running HP-UX
-  (a derivative of sysV with some BSD features) or BSD 4.3 ported by Utah.
-
-  If you're running HP-UX, specify `-opsystem=hpux'.
-  If you're running BSD, specify `-opsystem=bsd4-3'.
-NOTE-END */
-
-/* I don't understand why we have to do this at all!  -JimB */
-
-/* Define NOMULTIPLEJOBS on versions of HPUX before 6.5.  */
-
-/* #define NOMULTIPLEJOBS */
-
-/* Define this symbol if you are running a version of HP-UX
-   which predates version 6.01 */
-
-/* #define HPUX_5 */
-
-/* Define WORDS_BIG_ENDIAN if 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.  */
-
-/* #define WORD_MACHINE */
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-
-#ifndef hp9000s300
-#define hp9000s300
-#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 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.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* 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.  */
-
-/* #define 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 */
-
-/* For University of Utah 4.3bsd implementation on HP300s.
-   The #ifndef __GNUC__ definitions are required for the "standard" cc,
-   a very old, brain-dead version of PCC. */
-
-#ifdef BSD4_3
-
-/* Tell crt0.c that this is an ordinary 68020.  */
-#undef hp9000s300
-#define m68000
-
-#define CRT0_DUMMIES		bogus_a6,
-
-#ifndef __GNUC__
-#define LIBS_DEBUG		/* don't have -lg that works */
-#define C_DEBUG_SWITCH		/* don't support -g */
-#endif
-
-#undef LOAD_AVE_TYPE
-#undef LOAD_AVE_CVT
-#define LOAD_AVE_TYPE long
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) / 2048.0 * 100.0))
-
-#endif /* BSD4_3 */
-
-#ifndef BSD4_3
-/* The following definitions are for HPUX only.  */
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun on this machine.  */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* This library is needed with -g, on the 200/300 only.  */
-
-#if !defined(__GNUC__) || defined(__HPUX_ASM__)
-#define LIBS_DEBUG /usr/lib/end.o
-#endif
-
-/* Need a TEXT_START.  On the HP9000/s300 that is 0.  */
-#ifdef __GNUC__
-#define TEXT_START   0
-#endif
-
-/* The symbol FIONREAD is defined, but the feature does not work
-   on the 200/300.  */
-
-#define BROKEN_FIONREAD
-
-/* In older versions of hpux, for unknown reasons, S_IFLNK is defined
-   even though symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.
-
-   Version 6 of HP-UX has symbolic links.  */
-
-#ifdef HPUX_5
-#undef S_IFLNK
-#endif
-
-/* Define the BSTRING functions in terms of the sysV functions.
-   Version 6 of HP-UX supplies these in the BSD library,
-   but that library has reported bugs in `signal'.  */
-
-/* #ifdef HPUX_5 */
-#define bcopy(a,b,s)	memcpy (b,a,s)
-#define bzero(a,s)	memset (a,0,s)
-#define bcmp		memcmp
-/* #endif */
-
-/* On USG systems these have different names.
-   Version 6 of HP-UX supplies these in the BSD library,
-   which we currently want to avoid using.  */
-
-/* #ifdef HPUX_5 */
-#define index strchr
-#define rindex strrchr
-/* #endif */
-
-/* Define C_SWITCH_MACHINE to be +X if you want the s200/300
- * Emacs to run on both 68010 and 68020 based hp-ux's.
- *
- * Define OLD_HP_ASSEMBLER if you have an ancient assembler
- *
- * Define HPUX_68010 if you are using the new assembler but
- * compiling for a s200 (upgraded) or s310.  68010 based
- * processor without 68881.
- */
-
-/* These switches increase the size of some internal C compiler tables.
-   They are required for compiling the X11 interface files. */
-
-#ifndef HPUX_5
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -Wc,-Nd4000,-Ns3000
-#endif
-#endif
-
-/* Define NEED_BSDTTY if you have such. */
-
-#ifndef NOMULTIPLEJOBS
-#define NEED_BSDTTY
-#endif
-
-#endif /* not BSD4_3 */
-
-/* arch-tag: 6e0001a5-ed62-4258-9235-204348f6bdb9
-   (do not change this comment) */
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
deleted file mode 100644
index daaa4ddff02..00000000000
--- a/src/m/ibm370aix.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* m/ file for IBM 370 running AIX.
-   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008 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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#define AIX
-
-/* Include unistd.h, even though we don't define POSIX.  */
-#define NEED_UNISTD_H
-
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-#undef TEXT_START
-#undef SEGMENT_MASK
-#undef DATA_SECTION_ALIGNMENT
-
-#define TEXT_START 0
-#define SEGMENT_MASK 0
-#define DATA_SECTION_ALIGNMENT 0x00001000
-
-#undef LOAD_AVE_CVT
-#undef LOAD_AVE_TYPE
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_CVT(x) (int)(((double) (x)) * 100.0 / 1.0)
-#define LOAD_AVE_TYPE double
-
-#undef LIBS_MACHINE
-#define LIBS_MACHINE
-
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE -xa
-
-/* arch-tag: 8605b600-0580-4e49-9ba9-8b4a977f860a
-   (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index fcbb8f28864..db6ebee0d78 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -107,15 +107,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Here override various assumptions in ymakefile */
 
-#ifdef AIXHFT
-#define OBJECTS_MACHINE hftctl.o
-#endif
-
 #ifndef USG5
 #define C_SWITCH_MACHINE -D_BSD
 #endif
 
-#ifdef AIX3_2
+#ifdef AIX
 /* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
    on older versions of X where it happens to exist.  */
 #ifdef HAVE_LIBPTHREADS
@@ -159,15 +155,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    because .inp is a better convention to use in make-dist for naming
    random input files.  */
 #ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
-#ifdef AIX4
+#ifdef AIX
 #define LD_SWITCH_MACHINE -Wl,-bnodelcsect
-#else /* not AIX4 */
+#else /* not AIX */
 #ifdef HAVE_AIX_SMT_EXP
 #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp,-bI:/usr/lpp/X11/bin/smt.exp
 #else
 #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
 #endif
-#endif /* not AIX4 */
+#endif /* not AIX */
 #endif /* THIS_IS_MAKEFILE */
 
 /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
deleted file mode 100644
index 1fa475e95d7..00000000000
--- a/src/m/mips-siemens.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1993, 1995, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
-
-   This file contains some changes for our SVR4 based SINIX-Mips 5.4.
-   I hope this is helpful to port the emacs to our RM?00 series and
-   maybe to the DC/OSx (Mips-based) machines of Pyramid Inc.
-     (Marco.Walther@mch.sni.de)
-
-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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-Use m-mips4.h for RISCOS version 4; use s-bsd4-3.h with the BSD world.
-Note that the proper m- file for the Decstation is m-pmax.h.
-This is the m- file for SNI RM*00 machines. Use s- sinix5-4.h file!
-With this the file mips-siemens.h is obsolete.
-NOTE-END  */
-
-/* Define BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define 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
-
-/* Define how to take a char and sign-extend into an int.
-   On machines where char is signed, this is a no-op.  */
-
-#define SIGN_EXTEND_CHAR(c) ((signed char)(c))
-
-/* 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
-
-/* 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 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.  */
-
-#define 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 / 256.0)
-
-/* CDC EP/IX 1.4.3 uses /unix */
-
-#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 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
-
-/* Describe layout of the address space in an executing process.  */
-/* MARCO ???
-*/
-#define TEXT_START 0x400000
-/*
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS	0x10000000
-*/
-#ifdef UNEXEC
-#undef UNEXEC
-#endif
-#define UNEXEC unexsni.o
-
-#undef ORDINARY_LINK
-
-#undef LIBS_DEBUG
-
-/* Alter some of the options used when linking.  */
-
-#define LIBS_MACHINE -lmld
-#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
-
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-#define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-#define LD_SWITCH_MACHINE
-#else
-#define C_DEBUG_SWITCH -DSYSV
-#define C_OPTIMIZE_SWITCH -DSYSV
-#define LD_SWITCH_MACHINE
-#endif
-
-
-/* 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)))
-
-/* arch-tag: a4f5c090-0bd5-48f0-9724-b7d531f9b6c8
-   (do not change this comment) */
diff --git a/src/m/mips.h b/src/m/mips.h
index b3192d75de7..877e4e4c900 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -187,7 +187,7 @@ NOTE-END  */
 
 #define HAVE_SYSVIPC
 
-#if defined(emacs) && !defined(INHIBIT_BSD_TIME)
+#if defined(emacs)
 #include <bsd/sys/time.h>
 #endif
 
diff --git a/src/m/ncr386.h b/src/m/ncr386.h
deleted file mode 100644
index f98566a2959..00000000000
--- a/src/m/ncr386.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "intel386.h"
-
-#ifndef __GNUC__
-/* Allow emacs to link with "bcopy()" unresolved.  Works around a
-   problem where /usr/lib/libX11.so provides bcopy, but
-   /usr/ccs/lib/libX11.so does not.  */
-#define LD_SWITCH_X_DEFAULT -Wl,-z,nodefs
-#else /* __GNUC__ */
-
-/* Assuming we are using GNU ld, pass a -R option to it
-   so that shared libraries will be found at execution time
-   just as they are found at link time.  */
-#define LD_SWITCH_X_DEFAULT -Xlinker LD_SWITCH_X_SITE_AUX
-
-#endif /* __GNUC__ */
-
-/* arch-tag: 79c76283-7d50-499b-b910-8ef980357758
-   (do not change this comment) */
diff --git a/src/m/next.h b/src/m/next.h
deleted file mode 100644
index c6e2358fdd9..00000000000
--- a/src/m/next.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Configuration file for the NeXT machine.
-   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008  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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* Say this machine is a next if not previously defined */
-
-#ifndef NeXT
-#define NeXT
-#endif
-
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-
-/* Let the compiler tell us.  */
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIG_ENDIAN
-#endif
-
-/* Define how to take a char and sign-extend into an int.
-   On machines where char is signed, this is a no-op.  */
-
-#define SIGN_EXTEND_CHAR(c) (c)
-
-/* Use type int rather than a union, to represent Lisp_Object */
-
-#define NO_UNION_TYPE
-
-/* XINT must explicitly sign-extend */
-
-#define 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)
-
-/* Say that the text segment of a.out includes the header;
-   the header actually occupies the first few bytes of the text segment
-   and is counted in hdr.a_text.  */
-
-#define A_TEXT_OFFSET(HDR) sizeof (HDR)
-
-/* Mask for address bits within a memory segment */
-
-#define SEGSIZ 0x20000
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-#define SYSTEM_MALLOC
-
-#define HAVE_UNIX_DOMAIN
-
-#define LIB_X11_LIB -L/usr/lib/X11 -lX11
-
-/* This avoids a problem in Xos.h when using co-Xist 3.01.  */
-#define X_NOT_POSIX
-
-/* Conflicts in process.c between ioctl.h & tty.h use of t_foo fields */
-
-#define NO_T_CHARS_DEFINES
-
-/* Use our own unexec routines */
-
-#define UNEXEC unexnext.o
-
-/* We don't have a g library either, so override the -lg LIBS_DEBUG switch */
-
-#define LIBS_DEBUG
-
-/* We don't have a libgcc.a, so we can't let LIB_GCC default to -lgcc */
-
-#define LIB_GCC
-
-#if 0  /* ohl@chico.harvard.edu says to do this.  */
-/* Compile "strict bsd" to avoid warnings from include files */
-
-#define C_SWITCH_MACHINE	-bsd
-#endif
-
-/* Link this program just by running cc.  */
-#define ORDINARY_LINK
-
-/* start_of_text isn't actually used, so make it compile without error.  */
-#define TEXT_START 0
-/* This seems to be right for end_of_text, but it may not be used anyway.  */
-#define TEXT_END get_etext ()
-/* This seems to be right for end_of_data, but it may not be used anyway.  */
-#define DATA_END get_edata ()
-
-/* Defining KERNEL_FILE causes lossage because sys/file.h
-   stupidly gets confused by it.  */
-#undef KERNEL_FILE
-
-#define LD_SWITCH_MACHINE -X -noseglinkedit
-
-#define environ _environ
-
-#if 0 /* This is ok for NeXT system version 3.0 or above.  */
-/* Where to find the kernel, for load average.  */
-#define KERNEL_FILE "/mach"
-#endif
-
-/* This should be true for recent NeXT systems.  At least since 3.2.  */
-#define HAVE_MACH_MACH_H
-
-/* arch-tag: 1155cdcb-1f6c-4208-a2da-22c7473060a1
-   (do not change this comment) */
diff --git a/src/m/pmax.h b/src/m/pmax.h
deleted file mode 100644
index ad884ca8b36..00000000000
--- a/src/m/pmax.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Machine description file for DEC MIPS machines.
-
-   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008  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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-The operating system would be either osf1, ultrix, or NetBSD.
-NOTE-END  */
-
-#ifndef __MIPSEB__
-#undef WORDS_BIG_ENDIAN
-#endif
-#if defined (__NetBSD__)
-#define BROKEN_NOCOMBRELOC
-#else
-#undef LIB_STANDARD
-#undef START_FILES
-#endif
-#undef COFF
-#undef TERMINFO
-#define MAIL_USE_FLOCK
-#define HAVE_UNION_WAIT
-
-
-#ifdef MACH
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#else
-#if !defined (__NetBSD__)
-/* This line starts being needed with ultrix 4.0.  */
-/* You must delete it for version 3.1.  */
-#define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
-#endif
-#endif
-
-/* Supposedly the following will overcome a kernel bug.  */
-#undef LD_SWITCH_MACHINE
-#undef DATA_START
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS 0x10000000
-
-#if 0
-/* I don't see any such conflict in Ultrix 4.2, 4.2a, or 4.3.  And
-   the relocating allocator is a real win.  -JimB  */
-
-/* In Ultrix 4.1, XvmsAlloc.o in libX11.a seems to insist
-   on defining malloc itself.  This should avoid conflicting with it.  */
-#define SYSTEM_MALLOC
-#endif
-
-/* Override what mips.h says about this.  */
-#if !defined (__NetBSD__)
-#undef LINKER
-#endif
-
-#ifdef ultrix
-/* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
-   but it doesn't work right;
-   and it causes hanging in read_process_output.  */
-#define BROKEN_O_NONBLOCK
-#endif
-
-#ifndef __NetBSD__
-/* mcc@timessqr.gc.cuny.edu says this makes Emacs work with DECnet.  */
-#ifdef HAVE_LIBDNET
-#define LIBS_MACHINE -ldnet
-#endif
-
-/* mcc@timessqr.gc.cuny.edu says it is /vmunix on Ultrix 4.2a.  */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/vmunix"
-#endif
-
-#ifdef ultrix
-/* Jim Wilson writes:
-   [...] The X11 include files that Dec distributes with Ultrix
-   are bogus.
-
-   When __STDC__ is defined (which is true with gcc), the X11 include files
-   try to define prototypes.  The prototypes however use types which haven't
-   been defined yet, and thus we get syntax/parse errors.
-
-   You can not fix this by changing the include files, because the prototypes
-   create circular dependencies, in particular Xutil.h depends on types defined
-   in Xlib.h, and Xlib.h depends on types defined in Xutil.h.  So, no matter
-   which order you try to include them in, it will still fail.
-
-   Compiling with -DNeedFunctionPrototypes=0 will solve the problem by
-   directly inhibiting the bad prototypes.  This could perhaps just be put in
-   an a Ultrix configuration file.
-
-   Using the MIT X11 distribution instead of the one provided by Dec will
-   also solve the problem, but I doubt you can convince everyone to do this. */
-/* Addendum: the MIT X11 distribution neglects to define certain symbols
-   when NeedFunctionPrototypes is 0, but still tries to use them when
-   NeedVarargsPrototypes is 1 (which is its default value).  So if we're
-   going to disable non-variadic prototypes, we also need to disable
-   variadic prototypes.  --kwzh@gnu.ai.mit.edu */
-#define C_SWITCH_X_MACHINE -DNeedFunctionPrototypes=0 -DNeedVarargsPrototypes=0
-#endif
-
-/* Enable a fix in process.c.  */
-#define SET_CHILD_PTY_PGRP
-
-/* arch-tag: 45d5070e-d2b7-479f-b336-3fd497c36e15
-   (do not change this comment) */
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
deleted file mode 100644
index 071ea29d61e..00000000000
--- a/src/m/powerpcle.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* machine description file for PowerPC.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008  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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="Solaris2.5.1 Windows/NT AIX 4.1.2"
-*/
-
-/* Define WORDS_BIG_ENDIAN if 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
-
-/* Say this machine is a PowerPC Refernce Platform */
-
-#ifndef prep
-#define prep
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-
-#define NO_UNION_TYPE
-
-/* XINT must explicitly sign-extend */
-
-#define 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)
-
-/* Control a conditional in unexelf.c.  */
-#define SOLARIS_POWERPC
-
-/* arch-tag: dc2c3cb6-4683-45ae-961f-0a4f2bda3c61
-   (do not change this comment) */
diff --git a/src/m/tandem-s2.h b/src/m/tandem-s2.h
deleted file mode 100644
index b22f9bb66af..00000000000
--- a/src/m/tandem-s2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* machine description file for the Tandem Integrity S2.  */
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-
-/* This overrides some of the usual support for the mips and system V.3.  */
-
-/* The operating system apparently defines TIOCGETC
-   but it doesn't work.  */
-#undef BROKEN_TIOCGETC
-
-/* rs@ai.mit.edu said this was necessary for it to work.  However, some
-   user of this machine ought to try to get subprocesses to work.  */
-#undef subprocesses
-
-/* Correct some library file names.  */
-#define START_FILES pre-crt0.o /usr/lib/crt1.o1.31
-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o1.31
-
-/* arch-tag: ae34a1a6-6408-4b23-a6d3-ce4e8f124916
-   (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index 631a25d50c9..35050a11e10 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -100,12 +100,6 @@ NOTE-END  */
 #ifdef USG
 #define LIB_STANDARD -lPW -lc
 
-/* There is some bug in unexec in for usg 5.2 on a vax
-   which nobody who runs such a system has yet tracked down. */
-#ifndef USG5_0
-#define NO_REMAP
-#endif /* USG 5_0 */
-
 #define TEXT_START 0
 #endif /* USG */