* configure.in: Remove references to unsupported systems.

* notes/copyright: * MAINTAINERS: Remove references to files that have been removed. * os.texi (System Environment): Remove references to OSes that are not supported anymore. * PROBLEMS: * MACHINES: Remove references to systems not supported anymore. * makefile.w32-in: * Makefile.in: Remove references to Xenix. * gnus.el (gnus-use-long-file-name): Remove reference to xenix. * obsolete/x-apollo.el: Remove file for unsupported system. * term/x-win.el (vendor-specific-keysyms): Remove reference to Apollo. * progmodes/gud.el (gud-dgux-p): Remove. (dbx): Remove reference to dgux. * progmodes/ps-mode.el (ps-mode-print-function): * ps-print.el (ps-lp-system): * paths.el (rmail-spool-directory): * ls-lisp.el (ls-lisp-emulation): * lpr.el (lpr-lp-system): * dired.el (dired-chown-program): Remove references to dgux. * m/7300.h: * m/acorn.h: * m/alliant-2800.h: * m/alliant.h: * m/alliant1.h: * m/alliant4.h: * m/altos.h: * m/amdahl.h: * m/apollo.h: * m/att3b.h: * m/aviion-intel.h: * m/aviion.h: * m/celerity.h: * m/clipper.h: * m/cnvrgnt.h: * m/convex.h: * m/cydra5.h: * m/delta88k.h: * m/dpx2.h: * m/dual.h: * m/elxsi.h: * m/f301.h: * m/gould-np1.h: * m/gould.h: * m/i860.h: * m/ibmps2-aix.h: * m/ibmrt-aix.h: * m/ibmrt.h: * m/irist.h: * m/is386.h: * m/isi-ov.h: * m/mega68.h: * m/mg1.h: * m/news-r6.h: * m/news-risc.h: * m/news.h: * m/nh3000.h: * m/nh4000.h: * m/ns16000.h: * m/ns32000.h: * m/nu.h: * m/orion.h: * m/orion105.h: * m/paragon.h: * m/pfa50.h: * m/plexus.h: * m/pyramid.h: * m/pyrmips.h: * m/sh3el.h: * m/sps7.h: * m/sr2k.h: * m/stride.h: * m/sun1.h: * m/sun2.h: * m/sun3-68881.h: * m/sun3-fpa.h: * m/sun3-soft.h: * m/sun3.h: * m/sun386.h: * m/symmetry.h: * m/tad68k.h: * m/tahoe.h: * m/targon31.h: * m/tek4300.h: * m/tekxd88.h: * m/tower32.h: * m/tower32v3.h: * m/ustation.h: * m/wicat.h: * m/xps100.h: * s/cxux.h: * s/cxux7.h: * s/dgux.h: * s/dgux4.h: * s/dgux5-4-3.h: * s/dgux5-4r2.h: * s/esix.h: * s/esix5r4.h: * s/hiuxmpp.h: * s/hiuxwe2.h: * s/iris3-5.h: * s/iris3-6.h: * s/isc2-2.h: * s/isc3-0.h: * s/isc4-0.h: * s/isc4-1.h: * s/newsos5.h: * s/newsos6.h: * s/osf1.h: * s/osf5-0.h: * s/riscix1-1.h: * s/riscix12.h: * s/sco4.h: * s/sco5.h: * s/sunos4-0.h: * s/sunos4-1.h: * s/sunos413.h: * s/sunos4shr.h: * s/umax.h: * s/unipl5-2.h: * s/xenix.h: * cxux-crt0.s: * unexapollo.c: * unexconvex.c: * unexenix.c: * unexsni.c: Remove files for systems no longer supported. * m/intel386.h: Remove references to unsupported systems. * w32.c (get_emacs_configuration): Remove reference to i860. * sysdep.c: Remove dead code.
author: Dan Nicolaescu 2008-01-06 00:56:56 +0000
committer: Dan Nicolaescu 2008-01-06 00:56:56 +0000
commit: f3041af143f4ab74041fc918feee43aa8ac2da88 (patch)
tree: a84bdb93b8f941075b511480aa283e2847fbbcac /src/m
parent: 37d6e31370557ab868033dde113f11b54994e576 (diff)
download: emacs-f3041af143f4ab74041fc918feee43aa8ac2da88.tar.gz
emacs-f3041af143f4ab74041fc918feee43aa8ac2da88.zip
71 files changed, 2 insertions, 6891 deletions
diff --git a/src/m/7300.h b/src/m/7300.h
deleted file mode 100644
index 6e439a829cc..00000000000
--- a/src/m/7300.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* machine description file for AT&T UNIX PC model 7300
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
-   Modified for this machine by mtxinu!rtech!gonzo!daveb
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2-2"  */
-/* Supposedly now these machines have flexnames.
-/* # define SHORTNAMES */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   vax, m68000, ns16000 are the ones defined so far.  */
-# ifndef mc68k
-# define mc68k
-# endif
-#ifndef m68k
-#define m68k
-#endif
-/* Cause crt0.c to define errno.  */
-#define NEED_ERRNO
-/* Data type of load average, as read out of kmem.  */
-/* These are commented out since it is not supported by this machine.  */
-/* #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) */
-#ifndef __GNUC__
-#define SWITCH_ENUM_BUG
-#endif
-/* If you have the PD pty driver installed, uncomment the following line.  */
-/* #define HAVE_PTYS */
-#define HAVE_SYSVIPC
-/* We don't have memmove.  */
-#define memmove(d, s, n) safe_bcopy (s, d, n)
-/* These three lines were new in 18.50.  They were said to permit
-   a demand-paged executable, but someone else says they don't work.
-   Someone else says they do.  They didn't work because errno was an
-   initialized variable in crt0.c, and because of %splimit (also therein),
-   both of which have been fixed now. */
-#define SECTION_ALIGNMENT 0x03ff
-#define SEGMENT_MASK 0xffff
-#define LD_SWITCH_MACHINE -z
-/* Insist on using cc when compiling this.  GCC may have been
-   configured to use GAS syntax, which causes problems.  */
-#define CRT0_COMPILE cc -c -O -Demacs
-/* arch-tag: 66219dc7-ef45-4f0c-bb98-f35421f39c8d
-   (do not change this comment) */
diff --git a/src/m/acorn.h b/src/m/acorn.h
deleted file mode 100644
index 148d46454ab..00000000000
--- a/src/m/acorn.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* 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.  We can't
- * do this on the arm with gcc, since the first 4 args are in registers.  */
-#ifdef __GNUC__
-#define NO_ARG_ARRAY
-#else
-#undef NO_ARG_ARRAY
-#endif
-/* 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.  */
-/* ARM note - The RISCiX Norcroft C Compiler has ALL
-   non-32-bit types as unsigned */
-#define SIGN_EXTEND_CHAR(c) (((int)(c) << 24) >> 24)
-/* 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 */
-/* ARM note - this is done by the Norcroft compiler - symbol is `__arm' */
-/* 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
-#ifdef LDAV_SYMBOL
-#undef LDAV_SYMBOL
-#endif
-#define LDAV_SYMBOL "_iavenrun"
-/* 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  */
-/*
- * Scale factor for scaled integers used to count
- * %cpu time and load averages.
- */
-/* FSHIFT and FSCALE are defined in param.h, but are required by
-   LOAD_AVE_CVT, so they need to be defined here.  */
-#ifndef FSHIFT
-#define FSHIFT  8       /* bits to right of fixed binary point */
-#endif
-#ifndef FSCALE
-#define FSCALE  (1<<FSHIFT)
-#endif
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* 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.  */
-#undef VIRT_ADDR_VARIES
-/* This prevents Emacs dumping an unsqueezed binary with the
-   SQUEEZE bit set in the magic number. */
-#define ADJUST_EXEC_HEADER {hdr.a_magic &= ~MF_SQUEEZED;}
-#ifdef __GNUC__
-/* Keep gcc/RISCiX happy - it uses __gccmain where other versions of
-   gcc use __main, because of a library routine name clash. */
-#define __main __gccmain
-#endif  /* __GNUC__ */
-/* 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
-#ifndef NOT_C_CODE
-#define TEXT_START      0x8000
-#define DATA_END        &_edata
-extern int _edata;
-#define etext _etext
-#endif
-/* Avoid debugging library */
-#define LIBS_DEBUG
-/* Avoid sharing libc */
-#define LIB_STANDARD -lc_n
-/* Avoid sharing libX11 */
-#define LIB_X11_LIB -lX11_n
-/* All kinds of symbol definitions, so as to avoid multiply defined symbol
-   errors from the RISCiX linker. */
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-#define C_OPTIMIZE_SWITCH -O1 -fomit-frame-pointer -w -g -Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind -Doptarg=gnu_optarg -Dcfree=gnu_cfree -D___type=
-#else
-#define C_DEBUG_SWITCH -O -w -g -Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind -Doptarg=gnu_optarg -Dcfree=gnu_cfree
-#endif
-/* Turn this on to avoid the emacs malloc and use standard one */
-#undef SYSTEM_MALLOC
-/* Use <dirent.h>. */
-#define SYSV_SYSTEM_DIR
-#ifdef NO_REMAP
-/* CRT0_O is defined in s/riscix1-1.h or s/riscix1-2.h, as appropriate. */
-#define START_FILES pre-crt0.o CRT0_O
-#else
-Cannot
-do
-this
-yet
-#endif
-/* arch-tag: acee2955-8c49-4b40-813c-579f76f4c0c3
-   (do not change this comment) */
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
deleted file mode 100644
index 405267afb2b..00000000000
--- a/src/m/alliant-2800.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
-   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-/* 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
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-#define ALLIANT
-#define ALLIANT_2800
-#define sun                     /* Use X support for Sun keyboard stuff. */
-#define C_OPTIMIZE_SWITCH -Og   /* No concurrent code allowed here. */
-/* 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.  */
-/* On Alliants, bitfields are unsigned. */
-#define EXPLICIT_SIGN_EXTEND
-/* Concentrix uses a different kernel symbol for load average. */
-#undef  LDAV_SYMBOL             /* Undo definition in s-bsd4-2.h */
-#define LDAV_SYMBOL "_Loadavg"
-/* 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) (x * 100 / LOADAVG_SCALE)
-/* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
-   LOADAVG_SIZE, the number of items in the Loadavg array. */
-/* 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 UNEXEC unexfx2800.o
-#define LIBS_MACHINE -lalliant
-/* 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.  */
-#undef 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.  */
-/* Actually, Alliant CONCENTRIX does paging "right":
-   data pages are copy-on-write, which means that the pure data areas
-   are shared automatically and remapping is not necessary.  */
-#define NO_REMAP
-/* Alliant needs special crt0.o because system version is not reentrant */
-#define START_FILES crt0.o
-/* Alliant dependent code for dumping executing image.
-   See crt0.c code for alliant.  */
-#define ADJUST_EXEC_HEADER {\
-extern int _curbrk, _setbrk;\
-_setbrk = _curbrk;\
-hdr.a_bss_addr = bss_start;\
-unexec_text_start = hdr.a_text_addr;}
-/* POSIX Compatibility */
-/* Use System V.4 style getdents/readdir <dirent.h> for 2.2 and up. */
-#define SYSV_SYSTEM_DIR
-/* Use the K&R version of the DEFUN macro.  */
-#define USE_NONANSI_DEFUN
-/* arch-tag: 8ba70b15-d082-40f6-931d-14adfd7f9dbd
-   (do not change this comment) */
diff --git a/src/m/alliant.h b/src/m/alliant.h
deleted file mode 100644
index 7cad4bfb0c1..00000000000
--- a/src/m/alliant.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* alliant.h  Alliant machine running system version 2 or 3.
-   Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
-   Note that for version 1 of the Alliant system
-   you should use alliant1.h instead of this file.
-   Use alliant4.h for version 4.
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* 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.  */
-#ifdef ALLIANT_1
-#define NO_ARG_ARRAY
-#endif
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-#define ALLIANT
-/* 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.  */
-/* On Alliants, bitfields are unsigned. */
-#define EXPLICIT_SIGN_EXTEND
-/* No load average information available for Alliants. */
-#undef LOAD_AVE_TYPE
-#undef LOAD_AVE_CVT
-/* 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.  */
-#undef 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.  */
-/* Actually, Alliant CONCENTRIX does paging "right":
-   data pages are copy-on-write, which means that the pure data areas
-   are shared automatically and remapping is not necessary.  */
-#define NO_REMAP
-/* Alliant needs special crt0.o because system version is not reentrant */
-#define START_FILES crt0.o
-/* Alliant dependent code for dumping executing image.
-   See crt0.c code for alliant.  */
-#define ADJUST_EXEC_HEADER {\
-extern int _curbrk, _setbrk;\
-_setbrk = _curbrk;\
-hdr.a_bss_addr = bss_start;\
-unexec_text_start = hdr.a_text_addr;}
-/* cc screws up on long names.  Try making cpp replace them.  */
-#ifdef ALLIANT_1
-#define Finsert_abbrev_table_description Finsert_abbrev_table_descrip
-#define internal_with_output_to_temp_buffer internal_with_output_to_tem
-#endif
-/* "vector" is a typedef in /usr/include/machine/reg.h, so its use as
-   a variable name causes errors when compiling under ANSI C.  */
-#define vector xxvector
-/* arch-tag: 0ad5f932-f29a-4458-a24c-496cafdfd50d
-   (do not change this comment) */
diff --git a/src/m/alliant1.h b/src/m/alliant1.h
deleted file mode 100644
index ca597ac2762..00000000000
--- a/src/m/alliant1.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* config.h should include this file for version 1 of Alliant's
-   operating system.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-#define ALLIANT_1
-#include "alliant.h"
-/* arch-tag: 516688f9-4b94-4356-9bf0-92b2d72e664e
-   (do not change this comment) */
diff --git a/src/m/alliant4.h b/src/m/alliant4.h
deleted file mode 100644
index 2ab0a6bde1d..00000000000
--- a/src/m/alliant4.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* machine description file for Alliant Concentrix 4.0 or later.
-   Use alliant.h for versions 2 and 3.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-#include "alliant.h"
-/* Concentrix uses a different kernel symbol for load average. */
-#undef  LDAV_SYMBOL             /* Undo definition in s-bsd4-2.h */
-#define LDAV_SYMBOL "_Loadavg"
-/* 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) (x * 100 / LOADAVG_SCALE)
-/* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
-   LOADAVG_SIZE, the number of items in the Loadavg array. */
-/* arch-tag: cf917b55-c95e-4079-a4d1-d31e00c61b66
-   (do not change this comment) */
diff --git a/src/m/altos.h b/src/m/altos.h
deleted file mode 100644
index 0f4bb9b810f..00000000000
--- a/src/m/altos.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* altos machine description file       Altos 3068 Unix System V Release 2
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-#define EXPLICIT_SIGN_EXTEND
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-#define LIB_STANDARD -lc
-#define SWITCH_ENUM_BUG
-#define NO_REMAP
-#undef TERMINFO
-#undef CANNOT_DUMP
-#undef SHORTNAMES
-#define TERMCAP
-#define LIBS_TERMCAP -ltermlib
-#define PURESIZE 220000
-#define ALTOS
-#ifdef __GNUC__
-#define COFF_ENCAPSULATE
-#endif
-/* arch-tag: 4572d0ff-70bb-445f-80f1-2bbac3cf47cb
-   (do not change this comment) */
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
deleted file mode 100644
index 486e2925a55..00000000000
--- a/src/m/amdahl.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* amdahl machine description file
-   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/*
-This file for amdahl_uts created by modifying the template.h
-by Jishnu Mukerji 3/1/87
-The following line tells the configuration script what sort of
-operating system this machine is likely to run.
-USUAL-OPSYS="usg5-2-2"
-This file works with the Amdahl uts native C compiler. The 5.2u370
-compiler is so brain damaged that it is not even worth trying to use it.
-*/
-/* 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.  */
-#undef 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 /* not actually used anywhere yet! */
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-/* uts gets defined automatically */
-/* However for clarity define amdahl_uts */
-#define amdahl_uts
-/* 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)*/
-/* 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*/
-/* 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*/
-#define TERMINFO
-/* The usual definition of XINT, which involves shifting, does not
-   sign-extend properly on this machine.  */
-#define XINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
-                 ? (sign_extend_temp | 0xFF000000) \
-                 : (sign_extend_temp & 0x00FFFFFF))
-#ifdef emacs /* Don't do this when making xmakefile! */
-extern int sign_extend_temp;
-#endif
-/* The following needed to load the proper crt0.o and to get the
-   proper declaration of data_start in the #undef NO_REMAP case */
-#ifndef NO_REMAP
-#define START_FILES pre-crt0.o /lib/crt0.o
-#endif
-/* Perhaps this means that the optimizer isn't safe to use.  */
-#define C_OPTIMIZE_SWITCH
-/* Put text and data on non-segment boundary; makes image smaller */
-#define LD_SWITCH_MACHINE       -N
-/* When writing the 'xemacs' file, make text segment ro */
-#define EXEC_MAGIC      0410
-/* Mask for address bits within a memory segment */
-#define SEGSIZ 0x10000          /* Should this not be defined elsewhere ? */
-#define SEGMENT_MASK (SEGSIZ - 1)
-/* Compensate for error in signal.h.  */
-#define NSIG_MINIMUM 20
-/* arch-tag: cf665976-ddb1-49b0-b383-371e17f36acf
-   (do not change this comment) */
diff --git a/src/m/apollo.h b/src/m/apollo.h
deleted file mode 100644
index 2eac3098db9..00000000000
--- a/src/m/apollo.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* machine description file for Apollo machine.
-   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-/* #define m68000 */   /* Done by the C compiler */
-#define APOLLO
-/* Assume we use s-bsd4-3.h for system version 10.  */
-#ifdef BSD4_3
-#define APOLLO_SR10
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Do not define LOAD_AVE_TYPE or LOAD_AVE_CVT
-   since there is no /dev/kmem */
-/* Undefine VIRT_ADDR_VARIES because the virtual addresses of
-   pure and impure space as loaded do not vary.  */
-#undef VIRT_ADDR_VARIES
-/* Prevent -lg from being used for debugging.  Not needed.  */
-#define LIBS_DEBUG
-/* Can't use the system's termcap.  It has compressed data sections that
-   interfere with dumping.  That means we won't automatically get a vt100
-   when we start up emacs in a dm pad (a dubious feature at best anyway). */
-#undef LIBS_TERMCAP
-/* Must use the system's malloc and alloca.  */
-#define SYSTEM_MALLOC
-/* Define the file we use for UNEXEC. */
-#define UNEXEC unexapollo.o
-/* The Apollo linker does not recognize the -X switch, so we remove it here. */
-#define LD_SWITCH_SYSTEM
-/* Define C_SWITCH_MACHINE to compile for 68020/68030 or PRISM.
-   Define LD_SWITCH_MACHINE to save space by stripping symbols
-   and use X11 libraries. */
-#if _ISP__A88K
-#define C_SWITCH_MACHINE -W0,-ncompress -W0,-opt,2 -A cpu,a88k -A sys,any -A run,bsd4.3
-#define LD_SWITCH_MACHINE -A cpu,a88k -A sys,any -A run,bsd4.3
-#else
-#define C_SWITCH_MACHINE -W0,-ncompress -W0,-opt,2 -A cpu,3000 -A sys,any -A run,bsd4.3
-#define LD_SWITCH_MACHINE -A cpu,m68k -A sys,any -A run,bsd4.3
-#endif
-#define OLDXMENU_OPTIONS ${C_SWITCH_MACHINE}
-/* In SR10.4, unistd.h has bad prototype for getpgrp, so we don't include it. */
-#undef HAVE_UNISTD_H
-/* arch-tag: 33336588-6242-4e2e-a194-e38848b12813
-   (do not change this comment) */
diff --git a/src/m/att3b.h b/src/m/att3b.h
deleted file mode 100644
index 8e9a589bcd2..00000000000
--- a/src/m/att3b.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
-   Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2-2"  */
-/* 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 */
-#define ATT3B
-/* 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 */
-/* 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 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 */  /* Karl Kleinpaste says this isn't needed.  */
-/* SysV has alloca in the PW library */
-#define LIB_STANDARD -lPW -lc
-/* 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
-/* #define LD_SWITCH_MACHINE -N */
-/* Use Terminfo, not Termcap.  */
-#define TERMINFO
-/* -O has been observed to make correct C code in Emacs not work.
-   So don't try to use it.  */
-#if u3b2 || u3b5 || u3b15
-#define C_OPTIMIZE_SWITCH
-#endif
-/* Define our page size.  */
-#define NBPC 2048
-#if 0 /* If this is still needed, don't hard-code assumptions about
-         the number of VALBITS, or other assumptions about the
-         Lisp_Object representation.  Try to extend lisp.h instead, if
-         necessary.  */
-/* The usual definition of XINT, which involves shifting, does not
-   sign-extend properly on this machine.  */
-#define XINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
-                 ? (sign_extend_temp | 0xFF000000) \
-                 : (sign_extend_temp & 0x00FFFFFF))
-#endif
-#ifdef emacs /* Don't do this when making xmakefile! */
-extern int sign_extend_temp;
-#endif
-#if u3b2 || u3b5 || u3b15
-/* On 3b2/5/15, data space has high order bit on. */
-#define DATA_SEG_BITS 0x80000000
-#endif /* 3b2, 3b5 or 3b15 */
-#define TEXT_START 0
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-/* 3B2s with WIN/3B have winsize defined in ptem.h */
-#if u3b2
-#define NEED_PTEM_H
-#endif /* u3b2 */
-/* 3b2 does not have memmove, I'm told.  */
-/* It is safe to have no parens around the args in the safe_bcopy call,
-   and parens would screw up the prototype decl for memmove.  */
-#define memmove(d, s, n) safe_bcopy (s, d, n)
-/* This affects filemode.c.  */
-#define NO_MODE_T
-/* arch-tag: 07441a37-d630-447f-94fa-7da19645c97a
-   (do not change this comment) */
diff --git a/src/m/aviion-intel.h b/src/m/aviion-intel.h
deleted file mode 100644
index eb93a43214f..00000000000
--- a/src/m/aviion-intel.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This file is minor changes for the Data General AViiON intel machines
-   i586-dg-dguxR4* (tested on i586-dg-dguxR4.11MU04)
-   Done by Ehud Karni, 1998-may-30, ehud@unix.simonwiesel.co.il */
-#include "aviion.h"                /* 1st load m88k DGUX definitions */
-#define INTEL_DGUX                 /* define for future possible use */
-/* Intel machines are LITTLE ENDIAN */
-#undef WORDS_BIG_ENDIAN
-/* No correction needed for byte addresses */
-#undef WORD_MACHINE
-#ifndef INTEL386
-#define INTEL386                   /* Identify as Intel machine */
-#endif
-#undef  m88k                       /* It sure is NOT a Motorola machine */
-/* arch-tag: 7cbf89ef-237c-4da5-bdd0-8d569ae5f3ce
-   (do not change this comment) */
diff --git a/src/m/aviion.h b/src/m/aviion.h
deleted file mode 100644
index 832feb79a00..00000000000
--- a/src/m/aviion.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* machine description file for Data General AViiON.
-   Copyright (C) 1985, 1986, 1991, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* 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
-/* Define DATA_SEG_BITS if pointers need to be corrected with
-   a segment field.  */
-#ifdef FIX_ADDRESS
-#define DATA_SEG_BITS 0xef000000
-#endif
-/* 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 m88k
-#define m88k
-#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 */
-/* 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 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 */
-#define alloca(x) __builtin_alloca(x)
-/* 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
-/* Define ADDR_CORRECT(ADDR) to be a macro to correct an int which is
-   the bit pattern of a pointer to a byte into an int which is the
-   number of a byte.
-   This macro has a default definition which is usually right.
-   This default definition is a no-op on most machines (where a
-   pointer looks like an int) but not on all machines. */
-#define ADDR_CORRECT(ADDR) ((int)ADDR)
-/* Cast pointers to this type to compare them. */
-#define PNTR_COMPARISON_TYPE    void *
-/* Some machines that use COFF executables require that each section
-   start on a certain boundary *in the COFF file*.  Such machines should
-   define SECTION_ALIGNMENT to a mask of the low-order bits that must be
-   zero on such a boundary.  This mask is used to control padding between
-   segments in the COFF file.
-   If SECTION_ALIGNMENT is not defined, the segments are written
-   consecutively with no attempt at alignment.  This is right for
-   unmodified system V.  */
-#define SECTION_ALIGNMENT 0x7
-/* arch-tag: 9de8e6ed-ddd8-4480-8308-17ddd7c86559
-   (do not change this comment) */
diff --git a/src/m/celerity.h b/src/m/celerity.h
deleted file mode 100644
index 556c2765883..00000000000
--- a/src/m/celerity.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* machine description file for Celerity.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign extend */
-#define EXPLICIT_SIGN_EXTEND
-/* celerity preprocessor defines "accel", however the following is clearer */
-#define celerity
-/* #define NO_UNION_TYPE would be preferable,
-   but it does not work, and the reason is not yet known.  */
-#define NO_UNION_TYPE
-/* 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))
-/* A machine-specific loader switch is needed.  */
-#define LD_SWITCH_MACHINE -k100000
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-/* arch-tag: b4df1828-fab6-48f8-97bc-b8998c200eea
-   (do not change this comment) */
diff --git a/src/m/clipper.h b/src/m/clipper.h
deleted file mode 100644
index c0006f48eab..00000000000
--- a/src/m/clipper.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* machine description file for clipper
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* 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
-/* 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 */
-#define clipper 1
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* crt0.c should define a symbol `start' and do .globl with a dot.  */
-#define DOT_GLOBAL_START
-/* 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 */
-/* USG systems I know of running on Vaxes do not actually
-   support the load average, so disable it for them.  */
-/* 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))
-/* 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 */  /* Karl Kleinpaste says this isn't needed.  */
-/* 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 */
-#ifdef USG
-#define TEXT_START 0
-#endif /* USG */
-#define LD_TEXT_START_ADDR 8000
-/* arch-tag: 2f7981c1-7018-4a1e-b7b6-b2900de36a04
-   (do not change this comment) */
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
deleted file mode 100644
index 22478a273b6..00000000000
--- a/src/m/cnvrgnt.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* machine description file for convergent S series.
-   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* 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.  */
-#define m68000
-/* 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.
-   These are commented out since it is not supported by this machine.  */
-#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))
-/* 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.  */
-#undef 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
-/* Change some things to avoid bugs in compiler.  */
-#define SWITCH_ENUM_BUG
-/* some errno.h's don't actually allocate the variable itself.
-   Cause crt0.c to define errno.  */
-#define NEED_ERRNO
-/* arch-tag: 1a227f79-37e4-43af-a186-53c61296b0be
-   (do not change this comment) */
diff --git a/src/m/convex.h b/src/m/convex.h
deleted file mode 100644
index c8f447cf2fa..00000000000
--- a/src/m/convex.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* machine description file for Convex (all models).
-   Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-/* 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.
- * Maybe it would be better to simply correct the code. */
-#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 convex  /* The compiler doesn't always do this.  */
-#define convex
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-#define NO_UNION_TYPE
-#ifndef __GNUC__ /* David M. Cooke <dcooke@haven.larc.nasa.gov>
-                    and Ralph Sobek <Ralph.Sobek@cerfacs.fr> agree
-                    must ignore one arg when compiled with convex compiler.  */
-#define CRT0_DUMMIES ignore,
-#else
-#define CRT0_DUMMIES
-#endif
-/* crt0.c should define a symbol `start' and do .globl with a dot.  */
-#define DOT_GLOBAL_START
-/* 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)
-/* 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*/
-/* Must use the system's termcap.  It does special things.  */
-#define LIBS_TERMCAP -ltermcap
-/* 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 */
-/* Addresses on the Convex have the high bit set.  */
-#define DATA_SEG_BITS (1 << (BITS_PER_INT-1))
-/* Right shift is logical shift.
-   And the usual way of handling such machines, which involves
-   copying the number into sign_extend_temp, does not work
-   for reasons as yet unknown.  */
-#define XINT(a)  sign_extend_lisp_int (a)
-/* Convex uses a special version of unexec.  */
-#define UNEXEC unexconvex.o
-/* you gotta define 'COFF' for post 6.1 unexec. */
-#define COFF
-#define TEXT_START 0x80001000
-/* Posix stuff for Convex OS 8.1 and up. */
-#define LD_SWITCH_MACHINE \
-    -e__start -L /usr/lib \
-    '-A__iob=___ap$$iob' '-A_use_libc_sema=___ap$$use_libc_sema'
-/* Use <dirent.h>. */
-#define SYSV_SYSTEM_DIR
-#ifdef _POSIX_SOURCE
-/* These symbols have been undefined to advance the state of the art. */
-#define S_IFMT _S_IFMT
-#define S_IFDIR _S_IFDIR
-#define S_IREAD _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC _S_IEXEC
-#endif
-/* Ptys may start below ptyp0; call a routine to hunt for where. */
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER first_pty_letter()
-#if 0
-/*
- * Force a K&R compilation and libraries with the Convex V 4.0 C compiler
- */
-#define C_SWITCH_MACHINE -pcc
-#define LIB_STANDARD -lc_old
-#define LIBS_MACHINE -lC2_old
-#define LD_SWITCH_MACHINE -X -NL -fn -Enoposix -A__iob=___ap\$$iob \
- -A_use_libc_sema=___ap\$$use_libc_sema -L /usr/lib
-#endif
-/* Avoid error in xrdb.c - d.m.cooke@larc.nasa.gov.  */
-#define DECLARE_GETPWUID_WITH_UID_T
-/* Call getpgrp properly.  */
-#define GETPGRP_NO_ARG
-/* Tested for both Convex C and GNUC by d.m.cooke@larc.nasa.gov.  */
-#define LIBS_MACHINE -lC2
-/* Avoid error in getloadavg.c.  */
-#define NLIST_NAME_UNION  1
-#if 0  /* This is supposed to be an improvement.
-          It would be good for people to try enabling this code
-          and report the results.  */
-/* gcc -nostdlib prevents some math symbols from being included.
-   So we have to use -nostartfiles instead. */
-#define LINKER $(CC) -nostartfiles
-#define ORDINARY_LINK
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE \
-    -L /usr/lib \
-    '-A__iob=___ap$$iob' '-A_use_libc_sema=___ap$$use_libc_sema'
-#endif
-/* There is some indication that the convex has sys/wait.h
-   but it does not work right.  */
-#undef HAVE_SYS_WAIT_H
-/* arch-tag: 127e5ae1-4f03-40c0-a87e-d2cb02c59de8
-   (do not change this comment) */
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
deleted file mode 100644
index 4c95f226371..00000000000
--- a/src/m/cydra5.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* machine description file for Cydrome's CYDRA 5 mini super computer
-   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/* 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.  */
-#undef 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 */
-/* 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) x
-/* 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 data space precedes text space,
-   numerically.  */
-#undef VIRT_ADDR_VARIES
-/* The data segment in this machine always starts at address 0x10000000.
-   An address of data cannot be stored correctly in a Lisp object;
-   we always lose the high bits.  We must tell XPNTR to add them back.  */
-#define DATA_SEG_BITS 0x20000000
-#define DATA_START    0x20000000
-/* 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
-#define BROKEN_FIONREAD /* We son't even have it */
-#define LIBS_MACHINE    -lsocket -lnsl
-/* The data section in a coff file must be aligned in the file.  */
-#define DATA_SECTION_ALIGNMENT  0xFFF
-/* Compiler won't allow switch (x) when x is an enum.  */
-#define SWITCH_ENUM_BUG
-/* Explain how pty filenames work.  */
-#define PTY_ITERATION  for (i = 47; i >= 0; i--)
-#define PTY_NAME_SPRINTF  sprintf (ptyname, "/dev/pty%03x", i);
-#define PTY_TTY_NAME_SPRINTF  sprintf (ptyname, "/dev/ptm%03x", i);
-/* We can't do interrupt-driven input, so don't let user try.  */
-#define BROKEN_SIGIO
-/* arch-tag: ad70aae4-1f54-4e67-8677-6eeafb9bcbd9
-   (do not change this comment) */
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
deleted file mode 100644
index b5d0c8f190b..00000000000
--- a/src/m/delta88k.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Machine description file for Motorola System V/88 machines
-   Copyright (C) 1985, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef m88000     /* Some 88k C compilers already define this */
-#define m88000
-#endif
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-/* 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.  */
-/* No load average on Motorola machines. */
-/* #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)) */
-/* 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 */
-/* 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
-/* Motorola SysV has PTYs.  Not all usg3-5 systems do, so this is defined
-   here. */
-#define HAVE_PTYS
-#define SYSV_PTYS
-/* Ditto for IPC. */
-/*
- * we now have job control in R32V1
- */
-#undef NOMULTIPLEJOBS
-/*
- * we have bcopy, bzero, bcmp in libc.a (what isn't in libc.a?)
- */
-#define BSTRING
-/*
- * sockets are in R32V1
- */
-#define HAVE_SOCKETS
-/*
- * we have the wrong name for networking libs
- */
-#ifdef USG5_4
-/* rms: not needed; LIB_X11_LIB deals with this.  */
-/* #define LIBX11_SYSTEM -lX11 */
-#else
-#undef LIB_X11_LIB /* We don't have the shared libs as assumed in usg5-3.h. */
-#undef LIBX11_SYSTEM
-#define LIBX11_SYSTEM -lnsl -lbsd
-#endif /* USG5_4 */
-#define BROKEN_FIONREAD
-/* previously defined in usg5-4, if we choose to use that.  */
-#ifndef LIBS_SYSTEM
-#ifdef USG5_4
-#define LIBS_SYSTEM -lsocket -lnsl
-#else
-#define LIBS_SYSTEM -lbsd -lg
-#endif /* USG5_4 */
-#endif
-#define HAVE_TERMIOS
-#undef HAVE_TERMIO
-#define NO_TERMIO
-#undef sigsetmask
-#define NO_SIOCTL_H
-#ifdef USG5_4
-#ifdef HAVE_X_WINDOWS
-#else
-#undef BSTRING
-#endif /* HAVE_X_WINDOWS */
-#endif /* USG5_4 */
-#define NO_PTY_H
-#define USE_GETOBAUD
-/* arch-tag: c8ea1965-99d7-43df-ba32-29b66fc069be
-   (do not change this comment) */
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
deleted file mode 100644
index b39ef93ee34..00000000000
--- a/src/m/dpx2.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* machine description for Bull DPX/2 range
-   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/*
- * You need to either un-comment one of these lines, or copy one
- * of them to config.h before you include this file.
- * Note that some simply define a constant and others set a value.
- */
-/* #define ncl_el       /* DPX/2 210,220 etc */
-/* #define ncl_mr 1     /* DPX/2 320,340 (and 360,380 ?) */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-/* /bin/cc on ncl_el and ncl_mr define m68k and mc68000 */
-/* 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 FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* 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 /**/
-/* 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
-/*
- * end of the standard macro's
- */
-/*
- * a neat identifier to handle source mods (if needed)
- */
-#ifndef DPX2
-#define DPX2
-#endif
-/* Disable support for shared libraries in unexec.  */
-#undef USG_SHARED_LIBRARIES
-/*
- * if we use X11, libX11.a has these...
- */
-# undef LIB_X11_LIB
-# define LIB_X11_LIB -lX11
-# undef LIBX11_SYSTEM
-# define LIBX11_SYSTEM -lmalloc -lnsl
-# define BSTRING
-/*
- * we must have INET loaded so we have sockets
- */
-# define HAVE_SOCKETS
-/*
- * useful if you have INET loaded
- */
-# define LIBS_MACHINE -linet
-#if (defined(ncl_mr) || defined(ncl_el)) && !defined (NBPC)
-# define NBPC 4096
-#endif
-/*
- * if SIGIO is defined, much of the emacs
- * code assumes we are BSD !!
- */
-#define BROKEN_SIGIO
-/*
- * a good idea on multi-user systems :-)
- */
-#define CLASH_DETECTION         /* probably a good idea */
-/*
- * sysdep.c(sys_suspend) works fine with emacs-18.58
- * and BOS 02.00.45, if you have an earler version
- * of Emacs and/or BOS, or have problems, or just prefer
- * to start a sub-shell rather than suspend-emacs,
- * un-comment out the next line.
- */
-/* # define BROKEN_SIGTSTP /* make suspend-emacs spawn a sub-shell */
-#ifdef NOMULTIPLEJOBS
-# undef NOMULTIPLEJOBS
-#endif
-/*
- * no we don't want this at all
- */
-#ifdef USG_JOBCTRL
-# undef USG_JOBCTRL
-#endif
-/*
- * but we have that
-*/
-#define GETPGRP_NO_ARG
-/* select also needs this header file--but not in ymakefile.  */
-#ifndef NOT_C_CODE
-#include <sys/types.h>
-#include <sys/select.h>
-#endif
-#define TEXT_START 0
-/* we have termios */
-#undef HAVE_TERMIO
-#define HAVE_TERMIOS
-#define HAVE_TCATTR
-/* we also have this */
-#define HAVE_PTYS
-#define SYSV_PTYS
-/* It doesn't seem we have sigpause */
-#undef HAVE_SYSV_SIGPAUSE
-#define POSIX_SIGNALS
-/* We don't need the definition from usg5-3.h with POSIX_SIGNALS.  */
-#undef sigsetmask
-/* on bos2.00.45 there is a bug that makes the F_SETOWN fcntl() call
-   enters in an infinite loop. Avoid calling it  */
-#define F_SETOWN_BUG
-/* system closedir sometimes complains about wrong descriptor
-   for no apparent reasons. Use the provided closedir in sysdep.c instead */
-#ifdef HAVE_CLOSEDIR
-#undef HAVE_CLOSEDIR
-#endif
-/* Send signals to subprocesses by "typing" signal chars at them.  */
-#define SIGNALS_VIA_CHARACTERS
-/* This is to prevent memory clobbering on the DPX/2 200.  */
-#define LD_SWITCH_MACHINE -N -T32
- /* end of dpx2.h */
-/* arch-tag: 8cfdf817-aec7-4d99-a00d-0e77615e8e1b
-   (do not change this comment) */
diff --git a/src/m/dual.h b/src/m/dual.h
deleted file mode 100644
index d287f9502d2..00000000000
--- a/src/m/dual.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* machine description file for Dual machines using unisoft port.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Dual running System V (-machine=dual -opsystem=usg5-2)
-  As of 17.46, this works except for a few changes
-  needed in unexec.c.
-Dual running Uniplus (-machine=dual -opsystem=unipl5-2)
-  Works, as of 17.51.
-NOTE-END */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   vax, m68000, ns16000 are the ones defined so far.  */
-#ifndef m68000
-#define m68000
-#endif
-/* Data type of load average, as read out of kmem.  */
-/* These are commented out since it does not really work in uniplus */
-/* #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) */
-/* Change some things to avoid bugs in compiler */
-#define SWITCH_ENUM_BUG 1
-/* arch-tag: 7208d63c-9a23-469e-a9b1-908ac912c743
-   (do not change this comment) */
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
deleted file mode 100644
index 07a00bbf714..00000000000
--- a/src/m/elxsi.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* machine description file for Elxsi machine (running enix).
-   Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
-   Adapted by John Salmon
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* This file was modified by Matt Crawford <matt@tank.uchicago.edu>
-   to work under Elxsi's 12.0 release of BSD unix. */
-/* 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 */
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-#ifndef elxsi
-#define elxsi
-#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
-/* Name of kernel load average variable */
-#undef LDAV_SYMBOL
-#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)
-/* 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.
-   Earlier versions couldn't dump.
-   Changes for 12.0 release are in 19.1.
-   Dumping should work now.  */
-/* #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 */
-/* 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 is a guess for an alternate solution to whatever
-   problem motivated defining _sobuf in sysdep,c with extern char *_sobuf.  */
-#define _sobuf xsobuf
-/* Address of start of text segment as loaded.  */
-#define TEXT_START      0x800
-/* Tell crt0.c not to define environ.  */
-#define DONT_NEED_ENVIRON
-/* The elxsi has no debugger, so might as well optimize instead
-   of trying to make a symbol table.  */
-#define C_DEBUG_SWITCH -O
-/* Elxsi uses COFF under both Sys V and BSD environments */
-#define COFF
-#define ADJUST_EXEC_HEADER {\
-extern int _init_brk;\
-_init_brk = bss_start;\
-}
-/* arch-tag: 73bf1120-a994-4c29-8d60-af425d8bf10c
-   (do not change this comment) */
diff --git a/src/m/f301.h b/src/m/f301.h
deleted file mode 100644
index c427c19e05d..00000000000
--- a/src/m/f301.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Machine description file for Fujitsu F301 machines.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="uxpv"  */
-#include "delta88k.h"
-/* arch-tag: a0ed4f18-ecf2-4d9a-853b-36e0f6b45945
-   (do not change this comment) */
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
deleted file mode 100644
index cb3da1825cc..00000000000
--- a/src/m/gould-np1.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-/* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-/* UTX 3.0 uses a cross between COFF and a.out format, but closer to COFF. */
-/* at least currently, already defined by cpp, but make sure */
-#ifndef COFF
-#define COFF
-#endif COFF
-#include "gould.h"
-/* undefine what gould.h defined */
-#undef ADJUST_EXEC_HEADER
-/* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-/* UTX 3.0 uses a cross between COFF and a.out format, but closer to COFF. */
-#ifndef COFF    /* at least currently, already defined by cpp */
-#define COFF
-#endif COFF
-/* make Gould NP1 and PN COFF look like USG COFF */
-/* NP1 COFF */
-#undef aouthdr /* Since gould.h already defined these */
-#undef a_dtbase
-#ifdef IN_UNEXEC
-#define aouthdr exec
-#define ADJUST_TEXT_SCNHDR_SIZE
-/* Gould COFF - these are already defined in gould.h */
-/*
- * #define COFF_WITH_BSD_SYMTAB
- * #define HEADER_INCL_IN_TEXT
- * #define magic a_magic
- * #define tsize a_text
- * #define dsize a_data
- * #define bsize a_bss
- * #define entry a_entry
- * #define text_start a_txbase
- * #define data_start a_dtbase
-*/
-/* End Gould COFF */
-#endif /* IN_UNEXEC */
-/* NP1 supports a slightly different set than PowerNode */
-#define BAUD_CONVERT    { 0, 50, 75, 110, 134, 150, 300, 450, 600, 1200, \
-                              1800, 2000, 2400, 3600, 4800, 7200, 9600, \
-                                  19200, 38400 }
-#define LD_SWITCH_SYSTEM -BS -e start
-/* Undef C_DEBUG_SWITCH because it may have been set in gould.h */
-/* It will compile and load and works with dbx. Runs under an incomplete
-   port of gdb, but gdb doesn't always find things correctly. */
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -g
-#define LIBS_DEBUG -lg
-/* The data segment in this machine always starts at address 0x1000000 = 16M.
-   An address of data cannot be stored correctly in a Lisp object;
-   we always lose the high bits.  We must tell XPNTR to add them back.  */
-#define DATA_SEG_BITS 0x1000000
-#define DATA_START    0x1000000
-/* The text segment always starts at 0.
-   This way we don't need to have a label _start defined.  */
-#define TEXT_START 0
-/* Data isn't right next to text on an NP1 */
-#define NO_REMAP
-/* The bcopy bug has reappeared */
-#undef BSTRING
-#ifndef GOULD_NP1
-#define GOULD_NP1
-#endif
-/* arch-tag: cdfd3dbf-a5e4-464d-8cef-985fb7872873
-   (do not change this comment) */
diff --git a/src/m/gould.h b/src/m/gould.h
deleted file mode 100644
index cd16e09b785..00000000000
--- a/src/m/gould.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* machine description file for Gould PowerNodes with UTX/32 2.0 and 2.1.
-   (See MACHINES for older versions.)
-* NOTE: If you are running a pre-release of UTX/32 2.1 you should #define
-* RELEASE2_1 in config.h. This may also be necessary with un-updated
-* official releases of 2.1
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006, 2007 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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Gould Power Node (-machine=gould -opsystem=bsd4-2 or bsd4-3)
-(gould.h; s-bsd4-2.h or s-bsd4-3.h)
-  18.36 worked on versions 1.2 and 2.0 of the operating system.
-  On UTX/32 2.0, use -opsystem=bsd4-3
-  On UTX/32 1.2 and UTX/32S 1.0, use -opsystem=bsd4-2 and note that compiling
-  lib-src/sorted-doc tickles a compiler bug:  remove the -g flag to cc in the
-  makefile.
-  UTX/32 1.3 has a bug in the bcopy library routine.  Fix it by
-  #undef BSTRING in gould.h.
-  Version 19 incorporates support for releases 2.1 and later of UTX/32.
-  A site running a pre-release of 2.1 should #define RELEASE2_1 in config.h.
-NOTE-END */
-/* 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 GOULD
-#define GOULD
-#endif
-/* sel is an old preprocessor name on gould machines
-  - it is no longer needed and interferes with a variable in xmenu.c */
-#undef sel
-/* 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 double
-/* 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)
-/* 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
-/* No need to extend the user stack. */
-/* If this is a 2.1 system, COFF will be predefined by cpp. If it's */
-/* pre-2.1 COFF won't be defined, which is as it should be. */
-#ifdef COFF
-#define HEADER_INCL_IN_TEXT
-#define COFF_BSD_SYMBOLS
-/* Seems to be necessary with coff */
-#define NO_REMAP
-#ifndef GOULD_NP1
-/* gould-np1.h includes this file */
-/* keep the old value - don't skip over the headers */
-#define KEEP_OLD_TEXT_SCNPTR
-#define KEEP_OLD_PADDR
-#ifndef RELEASE2_1
-#define ADJUST_TEXTBASE
-#endif /*RELEASE2_1*/
-#endif /* GOULD_NP1 */
-#ifdef IN_UNEXEC
-/* make Gould NP and PN COFF look like USG COFF */
-/* PN COFF */
-#define aouthdr old_exec
-/* PN COFF doesn't have a data_start or a_dtbase field in its */
-/* optional header, so substitute a junk field */
-#define a_dtbase a_ccvers
-/* Gould COFF */
-#define magic a_magic
-#define tsize a_text
-#define dsize a_data
-#define bsize a_bss
-#define entry a_entry
-#define text_start a_txbase
-#define data_start a_dtbase
-#endif /* IN_UNEXEC */
-/* Define how to search all pty names.
- * This is for UTX 2.1 and greater on PN and all NP versions. It is only
- * accident that this happens to correspond to the same versions of UTX
- * as COFF does, but we'll take advantage of that here.
- */
-/*#define USE_PTY_PAIR*/
-#endif /* COFF */
-/* -g is sometimes broken on the Gould.  */
-#define C_DEBUG_SWITCH
-/* Comparing pointers as unsigned ints tickles a bug in older compilers.  */
-#define PNTR_COMPARISON_TYPE int
-/* The GOULD machine counts the a.out file header as part of the text.  */
-#define A_TEXT_OFFSET(HDR) sizeof (HDR)
-/* Machine-dependent action when about to dump an executable file.  */
-#ifndef COFF
-#define ADJUST_EXEC_HEADER   \
-  unexec_text_start = hdr.a_txbase + sizeof (hdr);
-#endif
-/* We use the system's crt0.o.  Somehow it avoids losing
-   with `environ' the way most standard crt0.o's do.  */
-#define START_FILES pre-crt0.o /lib/crt0.o
-/* arch-tag: 930cb9ef-f56f-4c06-aea0-5e81103bbf58
-   (do not change this comment) */
diff --git a/src/m/i860.h b/src/m/i860.h
deleted file mode 100644
index 6d79c5c8d38..00000000000
--- a/src/m/i860.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* machine description file for i860.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-/* 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
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#define INTEL860
-/* 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 / FSCALE)
-/* 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 */
-/* 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
-/* The X11 include files for i860-sysv4 need the macro SVR4 defined.
-   --Kaveh Ghazi (ghazi@noc.rutgers.edu) 8/9/94. */
-#ifdef USG5_4
-#ifndef SVR4
-#define SVR4
-#endif
-#endif
-/* arch-tag: 99f3a078-95e1-49d6-8666-04726eb25647
-   (do not change this comment) */
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
deleted file mode 100644
index 045bcf2c294..00000000000
--- a/src/m/ibmps2-aix.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, 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=usg5-3 on AIX 1.2.
-  -opsystem=usg5-2-2 should work on either AIX 1.1 or 1.2, but may not
-  work with certain new X window managers, and may be suboptimal.
-NOTE-END */
-/* 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 */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#define INTEL386
-#define aix386
-#define IBMAIX
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* crt0.c, if it is used, should use the i386-bsd style of entry.
-   with no extra dummy args.  On USG and XENIX,
-   NO_REMAP says this isn't used. */
-#define CRT0_DUMMIES bogus_fp,
-/* crt0.c should define a symbol `start' and do .globl with a dot.  */
-#define DOT_GLOBAL_START
-/* USG systems do not actually support the load average,
-so disable it for them.  */
-/* 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 */
-/* Define addresses, macros, change some setup for dump */
-#define NO_REMAP
-#undef static
-  /* Since NO_REMAP, problem with statics doesn't exist */
-#ifdef USG5_3
-#define TEXT_START 0x00000000
-#else
-#define TEXT_START 0x00400000
-#define TEXT_END 0
-#define DATA_START 0x00800000
-#define DATA_END 0
-/* The data segment in this machine always starts at address 0x00800000.
-   An address of data cannot be stored correctly in a Lisp object;
-   we always lose the high bits.  We must tell XPNTR to add them back.  */
-#define DATA_SEG_BITS 0x00800000
-#endif
-#if 0 /* I refuse to promulgate a recommendation that would make
-         users unable to debug - RMS.  */
-/* delete the following line to foil optimization, enable debugging */
-#define C_DEBUG_SWITCH -O
-#endif
-#define BSTRING
-#undef  HAVE_TERMIO
-#define HAVE_TERMIOS
-/* Send signals to subprocesses by "typing" special chars at them.  */
-#define SIGNALS_VIA_CHARACTERS
-/*
- *      Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- *      library functions.  Almost, but not quite the same as
- *      the 4.2 functions
- */
-#define SYSV_SYSTEM_DIR
-/*
- *      Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- *      The 4.2 opendir, etc., library functions.
- */
-#undef  NONSYSTEM_DIR_LIBRARY
-/* AIX utimes allegedly causes SIGSEGV.  */
-#undef HAVE_UTIMES /* override configuration decision */
-/* AIX defines FIONREAD, but it does not work.  */
-#define BROKEN_FIONREAD
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE long      /* For AIX (sysV) */
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define LOAD_AVE_CVT(x) (int) (((double) (x)/65535.0) * 100.0)
-/* This page was added in June 1990.  It may be incorrect for some versions
-   of aix, so delete it if it causes trouble.  */
-/* AIX has sigsetmask() */
-#undef sigsetmask
-/* AIX386 has BSD4.3 PTYs */
-#define HAVE_PTYS
-/* AIX has IPC. It also has sockets, and either can be used for client/server.
-   I would suggest the client/server code be changed to use HAVE_SOCKETS rather
-   than BSD as the conditional if sockets provide any advantages. */
-#define HAVE_SYSVIPC
-/* AIX has sockets */
-#define HAVE_SOCKETS
-/* #define SKTPAIR */ /* SKTPAIR works, but what is advantage over pipes? */
-/* Specify the font for X to use.  */
-#define X_DEFAULT_FONT "8x13"
-/* AIX has a wait.h.  */
-#define HAVE_WAIT_HEADER
-/* sioctl.h should not be included, says bytheway@cs.utah.edu.  */
-#undef NEED_SIOCTL
-/* I'm guessing that that means it doesn't want ptem.h either.  */
-#undef NEED_PTEM_H
-/* aix has `union wait'  */
-#define HAVE_UNION_WAIT
-/* Here override various assumptions in ymakefile */
-#ifdef __GNUC__
-#define alloca(n) __builtin_alloca(n)
-#if __GNUC__ < 2
-#define LIB_STANDARD /usr/local/lib/gcc-gnulib -lbsd -lrts -lc
-#endif
-/* -g fails to work, so it is omitted.  */
-/* tranle says that -fstrength-reduce does not help.  */
-#define C_DEBUG_SWITCH
-#else
-#define LIBS_MACHINE -lbsd -lrts
-#endif
-#define OBJECTS_MACHINE hftctl.o
-#define LD_SWITCH_MACHINE -T0x00400000 -K -e start
-#define LIBS_DEBUG              /* no -lg on aix ps/2 */
-#ifdef USG5_3
-#define XICCC
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE -T0x0 -K -e start
-/* Things defined in s-usg5-3.h that need to be overridden.  */
-#undef NOMULTIPLEJOBS
-#undef BROKEN_TIOCGETC
-#undef BROKEN_TIOCGWINSZ
-#undef LIBX11_SYSTEM
-#undef LIB_X11_LIB
-#endif
-/* Shared libraries are supported in a patch release of ps/2 1.2.1.
-   If the system has them, the user can turn them on, and this code
-   will make them work.  */
-#define USG_SHARED_LIBRARIES /* Assume that by 19's release everyone has this.  */
-#ifdef USG_SHARED_LIBRARIES
-#define ORDINARY_LINK
-#undef LIB_STANDARD
-#undef LD_SWITCH_MACHINE
-#if __GNUC__ > 1
-#define LD_SWITCH_MACHINE -shlib
-#endif
-#endif
-/* arch-tag: 2e7f44df-6a61-4a47-aa53-f7961bfeff11
-   (do not change this comment) */
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
deleted file mode 100644
index 57a9dbc4df1..00000000000
--- a/src/m/ibmrt-aix.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* RTPC AIX machine/system dependent defines
-   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2-2"  */
-/* 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
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-#ifndef IBMAIX
-#define IBMAIX
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-#define NO_UNION_TYPE
-/* No load average information appears in the AIX kernel.  VRM has this
-   info, and if anyone desires they should fix fns.c to get it out of VRM */
-/* 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 addresses, macros, change some setup for dump */
-#undef COFF
-#define NO_REMAP
-#undef static
-  /* Since NO_REMAP, problem with statics doesn't exist */
-#define TEXT_START 0x10000000
-#define TEXT_END 0
-#define DATA_START 0x20000000
-#define DATA_END 0
-/* The data segment in this machine always starts at address 0x20000000.
-   An address of data cannot be stored correctly in a Lisp object;
-   we always lose the high bits.  We must tell XPNTR to add them back.  */
-#define DATA_SEG_BITS 0x20000000
-#define N_BADMAG(x) BADMAG(x)
-#define N_TXTOFF(x) A_TEXTPOS(x)
-#define N_SYMOFF(x) A_SYMPOS(x)
-#define A_TEXT_OFFSET(HDR) sizeof(HDR)
-#define ADJUST_EXEC_HEADER \
-    unexec_text_start += sizeof(hdr); \
-    unexec_data_start = ohdr.a_dbase
-#undef ADDR_CORRECT
-#define ADDR_CORRECT(x) ((int)(x))
-/* This is the offset of the executable's text, from the start of the file.  */
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-/* AIX has PTYs, so define here, along with macros needed to make them work. */
-#define HAVE_PTYS
-#define PTY_ITERATION for (i=0; i<256; i++)
-#define PTY_NAME_SPRINTF sprintf (ptyname, "/dev/ptc%d", i);
-#define PTY_TTY_NAME_SPRINTF                            \
-{ /* Check that server side not already open */         \
-  if ((ioctl (*ptyv, PTYSTATUS, 0) & 0xFFFF) != 0)      \
-    {                                                   \
-      emacs_close (*ptyv);                              \
-      continue;                                         \
-    }                                                   \
-  /* And finally to be sure we can open it later */     \
-  sprintf (ptyname, "/dev/pts%d", i);                   \
-  signal (SIGHUP,SIG_IGN);                              \
-}     /* ignore hangup at process end */
-/* TIOCNOTTY doesn't occur on AIX, but the rest
-   of the conditionalized code in process.c does
-   the right thing if we fake this out.  */
-#define TIOCNOTTY IOCTYPE
-/* AIX has IPC. It also has sockets, and either can be used for client/server.
-   I would suggest the client/server code be changed to use HAVE_SOCKETS rather
-   than BSD_SYSTEM as the conditional if sockets provide any advantages. */
-#define HAVE_SYSVIPC
-/* AIX has sockets */
-#define HAVE_SOCKETS
-/* #define SKTPAIR */ /* SKTPAIR works, but what is advantage over pipes? */
-/* Specify the font for X to use.  */
-#define X_DEFAULT_FONT "Rom14.500"
-/* Here override various assumptions in ymakefile */
-/* On AIX 2.2.1, use these definitions instead
-#define C_SWITCH_MACHINE -I/usr/include -Nn2000
-#define LIBS_MACHINE -lX -lrts
-*/
-#define C_SWITCH_MACHINE -I/usr/include -I/usr/include/bsd -Nn2000
-#define LIBS_MACHINE -lXMenu -lX -lsock -lbsd -lrts
-#define OBJECTS_MACHINE hftctl.o
-#define START_FILES /lib/crt0.o
-/* -lXMenu, -lX must precede -lsock, -lbsd */
-#define LD_SWITCH_MACHINE -n -T0x10000000 -K -e start
-#if 0 /* I refuse to promulgate a recommendation that would make
-         users unable to debug - RMS.  */
-/* delete the following line to foil optimization, enable debugging */
-#define C_DEBUG_SWITCH -O
-#endif
-/* Setup to do some things BSD way - these won't work previous to AIX 2.1.2 */
-#include </usr/include/bsd/BSDtoAIX.h>
-#define BSTRING
-/* AIX utimes allegedly causes SIGSEGV.  */
-#undef HAVE_UTIMES /* override configuration decision */
-/* AIX defines FIONREAD, but it does not work.  */
-#define BROKEN_FIONREAD
-/* rocky@watson.ibm.com says this is needed.  */
-#define HAVE_FTIME
-/* arch-tag: eea85307-0ca9-4a9c-a4f6-89fad7591d28
-   (do not change this comment) */
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
deleted file mode 100644
index ca32db94518..00000000000
--- a/src/m/ibmrt.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* RTPC machine dependent defines
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* 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.  */
-#define ibmrt
-#define romp /* unfortunately old include files are hanging around.  */
-/* 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 double    /* For AIS (sysV) */
-/* 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)
-/* 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.  */
-#undef VIRT_ADDR_VARIES
-/* The data segment in this machine starts at a fixed address.
-   An address of data cannot be stored correctly in a Lisp object;
-   we always lose the high bits.  We must tell XPNTR to add them back.  */
-#define DATA_SEG_BITS 0x10000000
-#define DATA_START    0x10000000
-/* The text segment always starts at a fixed address.
-   This way we don't need to have a label _start defined.  */
-#define TEXT_START 0
-/* Taking a pointer to a char casting it as int pointer */
-/* and then taking the int which the int pointer points to */
-/* is practically guaranteed to give erroneous results */
-#define NEED_ERRNO
-#define SKTPAIR
-/* BSD has BSTRING.  */
-#define BSTRING
-/* Special switches to give the C compiler.  */
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -Dalloca=_Alloca
-#endif
-/* Don't attempt to relabel some of the data as text when dumping.
-   It does not work because their virtual addresses are not consecutive.
-   This enables us to use the standard crt0.o.  */
-#define NO_REMAP
-/* Use the bitmap files that come with Emacs.  */
-#define EMACS_BITMAP_FILES
-/* arch-tag: 89aa7e7d-593e-432c-966a-3db6aa2ad665
-   (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 22205ed762c..4ca09296f0f 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -25,15 +25,14 @@ Boston, MA 02110-1301, USA.  */
   USUAL-OPSYS="note"
 NOTE-START
-Intel 386 (-machine=intel386 or -machine=is386.h)
+Intel 386 (-machine=intel386)
  The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
-  isc2-2, 386-ix, esix, linux, sco3.2v4, and xenix.
+  isc2-2, 386-ix, and linux.
  18.58 should support a wide variety of operating systems.
  Use isc2-2 for Interactive 386/ix version 2.2.
  Use 386ix for prior versions.
-  Use esix for Esix.
  Use linux for Linux.
  It isn't clear what to do on an SCO system.
diff --git a/src/m/irist.h b/src/m/irist.h
deleted file mode 100644
index c0d55f96d0f..00000000000
--- a/src/m/irist.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* machine description file for Silicon Graphics Iris 2500 Turbos;
-   also possibly for non-turbo Irises with system release 2.5.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Version 18 said to work; use -opsystem=irist3-5 for system version 2.5
-and -opsystem=iris3-6 for system versions 3.6 and up.
-NOTE-END */
-#if 0
-  Message-Id: <8705050653.AA20004@orville.arpa>
-  Subject: gnu emacs 18.41 on iris [23].5 machines
-  Date: 04 May 87 23:53:11 PDT (Mon)
-  From: raible@orville.arpa
-  Aside from the SIGIOT, I know of only one bug, a real strange one:
-  I wrote a utimes interface, which copies elements from timevals
-  to utimbufs. This code is known good.  The problem is that in
-  emacs, the utime doesn't seem to take effect (i.e. doesn't change the
-  dates at all) unless I call report_file_error *after* the utime returns!
-    if (utime (name, &utb) < 0)
-      return;
-    else
-      /* XXX XXX XXX */
-      /* For some reason, if this is taken out, then the utime above breaks! */
-      /* (i.e. it doesn't set the time. This just makes no sense... */
-      /* Eric - May 4, 1987 */
-      report_file_error ("Worked just find\n", Qnil);
-  Without any sort of debugger that works on emacs (I know... but I dont have
-  *time* right now to start with gdb), it was quite time consuming to track
-  it down to this.
-  But since this code is only used for an optional 4th argument to one command
-  (copy-file), it would say that it is non-critical...
-#endif /* 0 */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef m68000
-#define m68000
-#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 FSCALE 1.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* 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 */
-/* 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 */
-/* There is an inconsistency between the sgi assembler, linker which barfs
-   on these. */
-#define internal_with_output_to_temp_buffer     stupid_long_name1
-#define Finsert_abbrev_table_description        stupid_long_name2
-/* arch-tag: 4076b26c-1fe6-4c28-94f3-3c863f074767
-   (do not change this comment) */
diff --git a/src/m/is386.h b/src/m/is386.h
deleted file mode 100644
index 5041db9a6c8..00000000000
--- a/src/m/is386.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* machine description file for Integrated Solutions 386 machine.  */
-#include "intel386.h"
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Intel 386 (-machine=intel386 or -machine=is386.h)
-  The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
-  isc2-2, 386-ix, esix, or xenix.
-  18.58 should support a wide variety of operating systems.
-  Use isc2-2 for Interactive 386/ix version 2.2.
-  Use 386ix for prior versions.
-  Use esix for Esix.  It isn't clear what to do on an SCO system.
-  -machine=is386 is used for an Integrated Solutions 386 machine.
-  It may also be correct for Microport systems.
-NOTE-END  */
-#define LIBX11_MACHINE -lnsl_s
-#define LIBS_DEBUG -lg
-/* arch-tag: b6b7e6ec-8b6c-440b-b9c8-961e4bebf0cf
-   (do not change this comment) */
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
deleted file mode 100644
index 6706ee9981b..00000000000
--- a/src/m/isi-ov.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* machine description file for ISI 68000's
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, 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=bsd4-2' or `-opsystem=bsd4-3'.
-NOTE-END */
-#define ISI68K
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-#define m68000
-/* 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.  */
-#ifdef BSD4_3
-#define LOAD_AVE_TYPE long
-#else
-#define LOAD_AVE_TYPE double
-#endif BSD4_3
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#ifdef BSD4_3
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-#else
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-#endif
-/* Mask for address bits within a memory segment */
-#define SEGMENT_MASK 0x1ffff
-/* use the -20 switch to get the 68020 code */
-/* #define C_SWITCH_MACHINE -20 */
-/* Use the version of the library for the 68020
-   because the standard library requires some special hacks in crt0
-   which the GNU crt0 does not have.  */
-#define LIB_STANDARD -lmc
-/* macros to make unexec work right */
-#define A_TEXT_OFFSET(HDR) sizeof(HDR)
-#define A_TEXT_SEEK(HDR) sizeof(HDR)
-/* A few changes for the newer systems.  */
-#ifdef BSD4_3
-/* The following line affects crt0.c.  */
-#undef m68k
-#undef LIB_STANDARD
-#define LIB_STANDARD -lmc -lc
-#define C_DEBUG_SWITCH -20 -O -X23
-#endif
-/* arch-tag: 3bfb5a11-d94e-4372-923b-9f47d0851f42
-   (do not change this comment) */
diff --git a/src/m/mega68.h b/src/m/mega68.h
deleted file mode 100644
index 0d22b572fc5..00000000000
--- a/src/m/mega68.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* machine description file for Megatest 68000's.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* Say this machine is a 68000 */
-#define m68000
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* 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))
-/* arch-tag: 61e6deb4-a93e-444b-bbd5-9887a83f1bbc
-   (do not change this comment) */
diff --git a/src/m/mg1.h b/src/m/mg1.h
deleted file mode 100644
index 515e9e23a96..00000000000
--- a/src/m/mg1.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
-   MG-1 version by L.M.McLoughlin
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-We are in the dark about what operating system runs on the Whitechapel
-systems.  Consult share-lib/MACHINES for information on which
-operating systems Emacs has already been ported to; one of them might
-work.  If you find an existing system name that works or write your
-own configuration files, please let the Free Software Foundation in on
-your work; we'd like to distribute this information.
-NOTE-END  */
-/* 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.  */
-/* ns16000 call sequence used on mg1 means that &arg = the args as an array */
-#undef NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* ns16000 addresses are byte addresses */
-#undef WORD_MACHINE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-/* Say this machine is a 16000 and an mg1, cpp says its a 32000 */
-#define ns16000
-#define mg1
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-/* Not sure on mg-1 but this shouldn't hurt! */
-#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.  */
-/* mg1 its an unsigned long */
-#define LOAD_AVE_TYPE unsigned long
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define FSCALE  1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* 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.  */
-/* ns16000's have an unexec, so should the mg-1 */
-#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.  */
-/* hmmmm... not sure.  copied sequent.h */
-#undef 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.  */
-/* mapping seems screwy */
-#define NO_REMAP
-/* Avoids a compiler bug */
-/* borrowed from sequent.h */
-/* arch-tag: e15d9072-9e1a-44bf-8add-966be535967b
-   (do not change this comment) */
diff --git a/src/m/news-r6.h b/src/m/news-r6.h
deleted file mode 100644
index cf6e019fd05..00000000000
--- a/src/m/news-r6.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* news-risc6.h is for the "RISC News", OS version 6.  */
-/* This is in the public domain.  */
-/* 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
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-#define NO_UNION_TYPE
-/* 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)
-/* 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
-/* Alter some of the options used when linking.  */
-/*#define C_DEBUG_SWITCH -g*/
-#define C_DEBUG_SWITCH -O -Olimit 2000
-#ifdef __GNUC__
-#define LD_SWITCH_MACHINE -g -Xlinker -D -Xlinker 800000
-#else /* !__GNUC__ */
-/*#define LD_SWITCH_MACHINE -D 800000 -g*/
-#define LD_SWITCH_MACHINE -D 800000
-#endif /* !__GNUC__ */
-#define LIBS_MACHINE -lmld
-#define LIBS_TERMCAP -lcurses
-/* 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: b9fd7b75-ba3c-46d4-8966-24381b13001b
-   (do not change this comment) */
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
deleted file mode 100644
index b7ea3dbceff..00000000000
--- a/src/m/news-risc.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* news-risc.h is for the "RISC News".
-   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-#include "mips.h"
-#ifdef NEWSOS5
-/* NEWS-OS 5.0.2 */
-#define LIBS_MACHINE -lmld
-#ifdef __GNUC__
-#define LD_SWITCH_MACHINE -g -Xlinker -D -Xlinker 800000
-#else
-#define C_DEBUG_SWITCH -g3
-#define C_OPTIMIZE_SWITCH -g3
-#define LD_SWITCH_MACHINE -g3 -D 800000 -non_shared
-#endif
-#else /* not NEWSOS5 */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-#define COFF
-#undef LD_SWITCH_MACHINE
-#ifdef __GNUC__
-#define LD_SWITCH_MACHINE -Xlinker -x -Xlinker -D -Xlinker 800000
-#else
-#define LD_SWITCH_MACHINE -x -D 800000
-#endif
-/* #define C_OPTIMIZE_SWITCH -O2 */
-#define C_OPTIMIZE_SWITCH -O
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH -g3
-#endif
-#undef TERMINFO
-/* We have no mode_t.  */
-#define NO_MODE_T
-/* Don't use the definitions in m/mips.h.  */
-#undef LINKER
-#define LINKER $(CC) -nostdlib
-#undef LIBS_MACHINE
-#define LIBS_MACHINE -lmld
-#undef KERNEL_FILE
-#define KERNEL_FILE "/vmunix"
-/* System's malloc, realloc, calloc and so on have bad prototypes,
-   using char * instead of void *, so tell gmalloc not to use the
-   prototypes.  */
-#define BROKEN_PROTOTYPES
-#endif /* not NEWSOS5 */
-/* arch-tag: cf17300c-dd34-4b9d-a657-2de718469662
-   (do not change this comment) */
diff --git a/src/m/news.h b/src/m/news.h
deleted file mode 100644
index 084c5abb92c..00000000000
--- a/src/m/news.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
-   Copyright (C) 1985, 1986, 1989, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, 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=bsd4-2, or -opsystem=bsd4-3 for system release 3.
-NOTE-END  */
-/* Say this machine is a 68000 */
-#ifndef m68000
-#define m68000
-#endif
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* One CRT0 Dummy variable */
-#if 0 /* larry@mitra.com says Sony's as doesn't like this.  */
-#define CRT0_DUMMIES one_dummy,
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* 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))
-/* Must use the system's termcap.  It does special things.  */
-#define LIBS_TERMCAP -ltermcap
-/* arch-tag: 79bfd831-874a-4339-85fa-b8cbdc29bdab
-   (do not change this comment) */
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
deleted file mode 100644
index e4a9817d57c..00000000000
--- a/src/m/nh3000.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* machine description for Harris Night Hawk Series 1200 and Series 3000
-   MC68030-based systems (FPP on these is custom).  These systems are
-   also known as "ecx" and "gcx".
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
- * series Motorola 88100 and 88110 based machines.
- */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef gcx
-#define gcx
-#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 / FSCALE)
-/* 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 */
-/* 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
-/* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
-/* #define NO_SOCK_SIGIO */
-/* arch-tag: 1529f2bc-50d9-42e7-ae72-6f40afadf09e
-   (do not change this comment) */
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
deleted file mode 100644
index 20fadb71e43..00000000000
--- a/src/m/nh4000.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* machine description for Harris NightHawk 88k based machines
-   (includes nh4000 and nh5000 machines).
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
- * series Motorola 88100 and 88110 based machines.
- */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef m88000
-#define m88000
-#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
-/* 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 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 */
-/* 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
-/* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
-/* #define NO_SOCK_SIGIO */
-/* arch-tag: d9e12769-ae79-4c25-953f-70db5b7ef5dd
-   (do not change this comment) */
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
deleted file mode 100644
index 6feddd97610..00000000000
--- a/src/m/ns16000.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* machine description file for ns16000.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-For the Encore, use `-opsystem=umax'.
-For a Tektronix 16000 box (a 6130, perhaps?), use `-opsystem=bsd4-2'.
-Use `-machine=ns16000' for both.
-NOTE-END  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#undef WORDS_BIG_ENDIAN
-/* Say this machine is a 16000 */
-#define ns16000 1
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Data type of load average, as read out of kmem.  */
-#ifndef USG
-#define LOAD_AVE_TYPE double
-#endif
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#ifndef USG
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-#endif
-#ifdef USG
-/* Control assembler syntax used in alloca.s.  */
-#define NS5
-/* On early NS systems ulimit was buggy. If set emacs uses this value
- * for the maximum sbrk value instead of getting it from ulimit.
- */
-#define ULIMIT_BREAK_VALUE 0x7E0000
-/* Early NS compilers have this bug. I believe it has been fixed in later
- * releases.
- */
-#define SHORT_CAST_BUG
-#define SEGMENT_MASK (NBPS - 1)
-/* Variables to get crt0.c to come out correctly */
-#define CRT0_DUMMIES bogus_fp,
-#define DOT_GLOBAL_START
-/* Control how emacsclient communicates.  */
-#define HAVE_SYSVIPC
-/* Set this to /bin/mail unless you have a better mail posting program */
-#define MAIL_PROGRAM_NAME "/usr/local/bin/remail"
-/* Tell sysdep.c not to define bzero, etc.  */
-#undef BSTRING
-#define BSTRING
-/* This avoids problems with uninitialized static variables going in .data.  */
-#define static
-#endif /* USG */
-/* arch-tag: 4210db3c-e35c-4b96-9399-1dbde3e00a57
-   (do not change this comment) */
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
deleted file mode 100644
index b6484b4b219..00000000000
--- a/src/m/ns32000.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* machine description file for National Semiconductor 32000, running Genix.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-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 */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-/* 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 / FSCALE) */
-/* 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 */
-/* 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 */
-#define TEXT_START 0
-#if !defined (__NetBSD__) && !defined (__OpenBSD__)
-#define EXEC_MAGIC 0410
-#define PURESIZE 140000
-#define START_FILES pre-crt0.o /lib/crt0.o
-#endif
-/* arch-tag: 13dde0e0-8ed5-4bc3-a0dc-5456c9db5f94
-   (do not change this comment) */
diff --git a/src/m/nu.h b/src/m/nu.h
deleted file mode 100644
index 279d14ff915..00000000000
--- a/src/m/nu.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* machine description file for TI Nu machines using system V.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   vax, m68000, ns16000 are the ones defined so far.  */
-#ifndef m68000
-#define m68000
-#endif
-#ifndef NU
-#define NU
-#endif
-/* Data type of load average, as read out of kmem.  */
-/* These are commented out since it does not really work in uniplus */
-/* #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) */
-/* Change some things to avoid bugs in compiler */
-#define SWITCH_ENUM_BUG 1
-/* The NU machine has a compiler that can handle long names.  */
-#undef SHORTNAMES
-/* Specify alignment requirement for start of text and data sections
-   in the executable file.  */
-#define SECTION_ALIGNMENT pagemask
-/* arch-tag: 7d2d9b6d-75d4-4c0d-96a9-a41f06212f35
-   (do not change this comment) */
diff --git a/src/m/orion.h b/src/m/orion.h
deleted file mode 100644
index cc3a7e395fc..00000000000
--- a/src/m/orion.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* machine description file for HLH Orion.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#undef WORDS_BIG_ENDIAN
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-#ifndef orion
-#define orion
-#endif
-/* 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
-/* 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 */
-#define EXPLICIT_SIGN_EXTEND
-/* 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  */
-#ifndef FSCALE
-#define FSCALE 1.0
-#endif
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* arch-tag: 4fcf38ad-d6b0-434b-bc10-16647d5a7fb6
-   (do not change this comment) */
diff --git a/src/m/orion105.h b/src/m/orion105.h
deleted file mode 100644
index fabcf67e2a9..00000000000
--- a/src/m/orion105.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* machine description file for HLH Orion 1/05 (Clipper).
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
-   Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
-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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-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
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-#define NO_UNION_TYPE
-/* Data type of load average, as read out of kmem.  */
-/* This used to be `double'.  */
-#define LOAD_AVE_TYPE long
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-/* This used to be 1.0.  */
-#ifndef FSCALE
-#define FSCALE 256
-#endif
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* HLH have a SIGWINCH defined (but unimplemented) so we need a sigmask */
-#ifndef sigmask
-#define sigmask(m) (1 << ((m) - 1))
-#endif
-/* Here is where programs actually start running */
-#define TEXT_START 0x8000
-#define LD_TEXT_START_ADDR 8000
-/* Arguments to ignore before argc in crt0.c.  */
-#define DUMMIES dummy1, dummy2,
-/* arch-tag: 32fed6e3-8cae-4882-b327-a68c2af6db7a
-   (do not change this comment) */
diff --git a/src/m/paragon.h b/src/m/paragon.h
deleted file mode 100644
index 11b98dea7ee..00000000000
--- a/src/m/paragon.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* m/ file for Paragon i860 machine.  */
-#include "i860.h"
-#define COFF
-#define SYSTEM_MALLOC
-#define TEXT_START 0x10000
-#define LIB_STANDARD -lc -lic -lmach
-#define KEEP_OLD_TEXT_SCNPTR
-#define KEEP_OLD_PADDR
-#define drem fmod
-/* arch-tag: c1bc280c-25e5-4993-9b91-333c52ab3674
-   (do not change this comment) */
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
deleted file mode 100644
index 5f98dc993c7..00000000000
--- a/src/m/pfa50.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Machine description file for PFU A-series.
-   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-#define m68000
-#define mc68000 1
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* The symbol FIONREAD is defined, but the feature does not work.  */
-#define BROKEN_FIONREAD
-/* 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
-/* Define TEXT_START_ADDR if your linker don't set execute point to _start.
-   If it needed, temacs always CORE-DUMP.  */
-#define TEXT_START_ADDR __start
-/* Define START_FILES if your machine used _start.
- */
-#define START_FILES crt0.o
-/* Define LD_SWITCH_MACHINE if your linker needs it.
- */
-#define LD_SWITCH_MACHINE -e __start
-#if     pfa50 || pfa70
-/* On A-50/60/70/80, data space has high order byte use. */
-#define DATA_SEG_BITS 0x60000000
-#endif /* pfa50, pfa70 */
-/* SX/A has alloca in the PW library.  */
-#define LIB_STANDARD -lPW -lc
-/* SX/A uses terminfo and lib/curses   */
-#define TERMINFO
-#define HAVE_PTYS
-#define HAVE_SOCKETS
-/* SX/A use SystemV style getdents/readdir. */
-/* SX/A does not have sigblock(2) */
-#define sigblock(mask)  (0)
-#define NO_SIOCTL_H
-#define BROKEN_SIGIO
-/* arch-tag: f3a127d5-790b-4c78-b6be-837139fb12c4
-   (do not change this comment) */
diff --git a/src/m/plexus.h b/src/m/plexus.h
deleted file mode 100644
index 51961977904..00000000000
--- a/src/m/plexus.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* machine description file for the Plexus running System V.2.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* 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.  */
-#undef 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-/* Plexus predefines m68 instead of m68000. */
-#define m68000 m68
-/* 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.  */
-#undef EXPLICIT_SIGN_EXTEND
-/* Data type of load average, as read out of kmem.  */
-#undef LOAD_AVE_TYPE
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#undef LOAD_AVE_CVT
-/* 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.  */
-#undef 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.  */
-#undef NO_REMAP
-/* Use the following on ld so we can use the gnu crt0
-   The plexus ld looks for start                      */
-#define LD_SWITCH_MACHINE -e __start
-/* Use the PW library, which contains alloca.  */
-#define LIB_STANDARD -lPW -lc
-/* crt0.c should use the vax-bsd style of entry, with no dummy args.  */
-#define CRT0_DUMMIES zero1, zero2,
-/* This triggers some stuff to avoid a compiler bug */
-#define TAHOE_REGISTER_BUG
-/* arch-tag: 78c607eb-b4f8-4750-b575-39670d979448
-   (do not change this comment) */
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
deleted file mode 100644
index 1b834c60ba0..00000000000
--- a/src/m/pyramid.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* machine description file for pyramid.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-2"  */
-/* 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.  */
-#ifdef __GNUC__
-#define NO_ARG_ARRAY
-#endif
-/* XINT must explicitly sign extend */
-#define EXPLICIT_SIGN_EXTEND
-/* pyramid preprocessor defines "pyr", however the following is clearer */
-#define pyramid
-/* Don't use the union types any more.  They were used until Emacs 17.45.  */
-#define NO_UNION_TYPE
-/* 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))
-/* Don't use the ordinary -g for debugging in cc */
-#define C_DEBUG_SWITCH -gx
-/* Reenable this #define for old versions of the Pyramid system.  */
-/* #define PYRAMID_OLD */
-/* arch-tag: b9097bc9-92be-46d4-acb1-13c2b966d581
-   (do not change this comment) */
diff --git a/src/m/pyrmips.h b/src/m/pyrmips.h
deleted file mode 100644
index 67705fb6619..00000000000
--- a/src/m/pyrmips.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Configuration file for the Pyramid machine that uses the MIPS cpu.  */
-/* This does not fully work.  */
-#include "m-pyramid.h"
-#define SYSTEM_MALLOC
-#define CANNOT_DUMP
-/* arch-tag: 82559148-25a8-466d-bbb3-f903f7666b7a
-   (do not change this comment) */
diff --git a/src/m/sh3el.h b/src/m/sh3el.h
deleted file mode 100644
index 77f6dc12c23..00000000000
--- a/src/m/sh3el.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* machine description file for sh3el
-   Copyright (C) 1985, 1986, 2006, 2007  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, 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="<name of system .h file here, without the s- or .h>"  */
-/* 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
-/* 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 */
-/* 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 / FSCALE)
-/* 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 HAVE_ALLOCA to say that the system provides a properly
-   working alloca function and it should be used.
-   Undefine it if an assembler-language alloca
-   in the file alloca.s should be used.  */
-#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
-/* After adding support for a new system, modify the large case
-   statement in the `configure' script to recognize reasonable
-   configuration names, and add a description of the system to
-   `etc/MACHINES'.
-   If you've just fixed a problem in an existing configuration file,
-   you should also check `etc/MACHINES' to make sure its descriptions
-   of known problems in that configuration should be updated.  */
-/* arch-tag: ee325990-6f40-47a2-b9df-60ecf3599899
-   (do not change this comment) */
diff --git a/src/m/sps7.h b/src/m/sps7.h
deleted file mode 100644
index 67fc60c1b6a..00000000000
--- a/src/m/sps7.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* machine description file for Bull SPS-7.
-   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-#ifndef m68000
-#define m68000
-#endif
-#define sps7
-/* 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.  */
-/* Suspect there is something weird about this machine, so turn it off.  */
-/* #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) */
-#define SMX
-#define V3x
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-#define HAVE_PTYS
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-#define HAVE_SOCKETS
-/*      Have the socketpair call
-*/
-#define SKTPAIR
-/* Define CLASH_DETECTION if you want lock files to be written
-   so that Emacs can tell instantly when you try to modify
-   a file that someone else has modified in his Emacs.  */
-#define CLASH_DETECTION
-/* Use Berkeley style interface to nlist */
-#define NLIST_STRUCT
-/* Define this to cause -N to be passed to ld.  This is needed
- *  in uniplus because of its funny memory space layout.
- * SMX--If you are using 32 bit (COFF) use "-N", else don't use anything.
- */
-#define LD_SWITCH_MACHINE -N -T32 -e __start
-/* If you are compiling for a 68020, then use -lc32 else use -lc */
-#define LIB_STANDARD -lc32
-/* Fore 16 bit, -linet, for 32 bit -linet32 (be sure you have it!). */
-#define LIBS_MACHINE -linet32
-/* Use -T32 for 68020, -T16 otherwise */
-#define C_SWITCH_MACHINE -T32
-#define BROKEN_SIGIO
-/* Other than 68020 use ld16, as32, or undefine (defaults ld and as). */
-#define ASS as32
-#ifdef V3x
-#define EXEC_MAGIC 0x10b
-#define SEGMENT_MASK (NBPS-1)
-#define ADJUST_EXEC_HEADER f_hdr.f_magic = SMROMAGIC;\
- f_ohdr.stsize = 0;
-#endif
-/* arch-tag: 2240f71c-6f3b-4a82-80fc-4d56c682d7ad
-   (do not change this comment) */
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
deleted file mode 100644
index 6c17795e058..00000000000
--- a/src/m/sr2k.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-/* 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.  */
-#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 hp9000s800
-#       define hp9000s800
-#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
-/* 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))
-/* #ifdef __hpux */
-/* 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
-/* 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))
-/* 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
-/* the data segment on this machine always starts at address 0x40000000. */
-#define DATA_SEG_BITS 0x40000000
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-/* 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.  */
-#define UNEXEC unexhp9k800.o
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-/* Include the file bsdtty.h, since this machine has job control.  */
-/* #define NEED_BSDTTY */
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-#if 0   /* Supposedly no longer true.  */
-/* In 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.  */
-#undef S_IFLNK
-#endif
-/* On USG systems these have different names. */
-#define index strchr
-#define rindex strrchr
-/* #endif */
-/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
-   (do not change this comment) */
diff --git a/src/m/stride.h b/src/m/stride.h
deleted file mode 100644
index d846a6c9843..00000000000
--- a/src/m/stride.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
-   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* 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.  */
-#undef 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe, APOLLO and STRIDE
-   are the ones defined so far.  */
-#define m68000                  /* because the SGS compiler defines "m68k" */
-#ifndef STRIDE
-#define STRIDE
-#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 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))
-/* 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.  */
-#undef VIRT_ADDR_VARIES
-/* The STRIDE system is more powerful than standard USG5.  */
-#define HAVE_PTYS
-#define BSTRING
-#define SKTPAIR
-#define HAVE_SOCKETS
-#define MAIL_USE_FLOCK
-#undef TERMINFO
-#define EXEC_MAGIC 0413
-/* USG wins again: Foo! I can't get SIGIO to work properly on the Stride, because I'm
-   running a System V variant, and don't have a reliable way to block SIGIO
-   signals without losing them.  So, I've gone back to non-SIGIO mode, so
-   please append this line to the file "stride.h":
- */
-#define BROKEN_SIGIO
-/* Specify alignment requirement for start of text and data sections
-   in the executable file.  */
-#define SECTION_ALIGNMENT (getpagesize() - 1)
-/*
- * UniStride has this in /lib/libc.a.
- */
-#undef NONSYSTEM_DIR_LIBRARY
-/* Define this macro if system defines a type `union wait'.  */
-#define HAVE_UNION_WAIT
-/* arch-tag: 65c635ed-5bc7-4ace-ab20-f3442429c8ba
-   (do not change this comment) */
diff --git a/src/m/sun1.h b/src/m/sun1.h
deleted file mode 100644
index 03cb4e803ff..00000000000
--- a/src/m/sun1.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* machine description file for Sun 68000's
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
-                -opsystem=bsd4-2 or -opsystem=sunos4)
-  Whether you should use sun1, sun2 or sun3 depends on the
-                   VERSION OF THE OPERATING SYSTEM
-  you have.  There are three machine types for different versions of
-  SunOS.  All are derived from Berkeley 4.2, meaning that you should
-  use -opsystem=bsd4-2.  Emacs 17 has run on all of them.  You will
-  need to use sun3 on Sun 2's running SunOS release 3.
-  For SunOS release 4 on a Sun 3, use -machine=sun3 and
-  -opsystem=sunos4.  See the file share-lib/SUNBUG for how to solve
-  problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-#define m68000
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Sun can't write competent compilers */
-#define COMPILER_REGISTER_BUG
-/* 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)
-/* Must use the system's termcap.  It does special things.  */
-#define LIBS_TERMCAP -ltermcap
-/* Mask for address bits within a memory segment */
-#define SEGMENT_MASK (SEGSIZ - 1)
-/* arch-tag: 58ec9c79-48bd-4d1b-aad1-65a09a6b0d10
-   (do not change this comment) */
diff --git a/src/m/sun2.h b/src/m/sun2.h
deleted file mode 100644
index a872bf6f3bb..00000000000
--- a/src/m/sun2.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* machine description file for Sun 68000's OPERATING SYSTEM version 2.
-  Note that "sun2.h" refers to the operating system version, not the
-  CPU model number.  See the MACHINES file for details.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
-                -opsystem=bsd4-2 or -opsystem=sunos4)
-  Whether you should use sun1, sun2 or sun3 depends on the
-                   VERSION OF THE OPERATING SYSTEM
-  you have.  There are three machine types for different versions of
-  SunOS.  All are derived from Berkeley 4.2, meaning that you should
-  use -opsystem=bsd4-2.  Emacs 17 has run on all of them.  You will
-  need to use sun3 on Sun 2's running SunOS release 3.
-  For SunOS release 4 on a Sun 3, use -machine=sun3 and
-  -opsystem=sunos4.  See the file share-lib/SUNBUG for how to solve
-  problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* Say this machine is a 68000 */
-#ifndef m68000
-#define m68000
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* Sun can't write competent compilers */
-#define COMPILER_REGISTER_BUG
-/* 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 this is a Sun 2; must check for and maybe reinitialize
-   the "sky" board.  */
-#define sun2
-/* Must use the system's termcap.  It does special things.  */
-#define LIBS_TERMCAP -ltermcap
-/* Mask for address bits within a memory segment */
-#define SEGMENT_MASK (SEGSIZ - 1)
-/* arch-tag: 543c3570-74ca-4099-aa47-db7c7b691c8e
-   (do not change this comment) */
diff --git a/src/m/sun3-68881.h b/src/m/sun3-68881.h
deleted file mode 100644
index 33b9c2bd527..00000000000
--- a/src/m/sun3-68881.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* sun3-68881.h, for a Sun 3, using the 68881.  */
-#include "sun3.h"
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun with 68881 co-processor (-machine=sun3-68881;
-                             -opsystem=bsd4-2 or -opsystem=sunos4)
-  Versions 1, 2, and 3 of the operating system are derived from
-  Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-  For SunOS release 4 on a Sun 3 with a 68881, use -machine=sun3-68881
-  and -opsystem=sunos4.  See the file share-lib/SUNBUG for how to
-  solve problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* In case we are using floating point, work together with crt0.c.  */
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -f68881
-#endif
-#define sun_68881
-#define START_FILES crt0.o /usr/lib/Mcrt1.o
-/* arch-tag: f8659e89-5f5e-4921-940c-814a5786b901
-   (do not change this comment) */
diff --git a/src/m/sun3-fpa.h b/src/m/sun3-fpa.h
deleted file mode 100644
index b78adaf7378..00000000000
--- a/src/m/sun3-fpa.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* sun3-fpa.h, for a Sun 3, using the Sun fpa.  */
-#include "sun3.h"
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun with FPA co-processor (-machine=sun3-fpa;
-                           -opsystem=bsd4-2 or -opsystem=sunos4)
-  Versions 1, 2, and 3 of the operating system are derived from
-  Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-  For SunOS release 4 on a Sun 3 with an FPA, use -machine=sun3-fpa
-  and -opsystem=sunos4.  See the file share-lib/SUNBUG for how to
-  solve problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* In case we are using floating point, work together with crt0.c.  */
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -ffpa
-#endif
-#define sun_fpa
-#define START_FILES crt0.o /usr/lib/Wcrt1.o
-/* arch-tag: db287fbb-966f-4a70-a3f4-a6768c09326b
-   (do not change this comment) */
diff --git a/src/m/sun3-soft.h b/src/m/sun3-soft.h
deleted file mode 100644
index 32b2558c01b..00000000000
--- a/src/m/sun3-soft.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* sun3-soft.h, for a Sun 3, using the Sun with software floating point.  */
-#include "sun3.h"
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun with software floating point (-machine=sun3-soft;
-                                  -opsystem=bsd4-2 or -opsystem=sunos4)
-  Versions 1, 2, and 3 of the operating system are derived from
-  Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-  If you want to use software floating point on SunOS release 4 on a
-  Sun 3, use -machine=sun3-68881 and -opsystem=sunos4.  See the file
-  share-lib/SUNBUG for how to solve problems caused by bugs in the
-  "export" version of SunOS 4.
-NOTE-END  */
-/* In case we are using floating point, work together with crt0.c.  */
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -fsoft
-#endif
-#define sun_soft
-#define START_FILES crt0.o /usr/lib/Fcrt1.o
-/* arch-tag: 76e9d7e6-66a8-4c4f-b0a5-335d082e5720
-   (do not change this comment) */
diff --git a/src/m/sun3.h b/src/m/sun3.h
deleted file mode 100644
index b2713703416..00000000000
--- a/src/m/sun3.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* machine description file for Sun 68000's OPERATING SYSTEM version 3
-   (for either 68000 or 68020 systems).  */
-#include "sun2.h"
-#undef sun2
-#ifndef sun3
-#define sun3
-#endif
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
-                -opsystem=bsd4-2 or -opsystem=sunos4)
-  Whether you should use sun1, sun2 or sun3 depends on the
-                   VERSION OF THE OPERATING SYSTEM
-  you have.  There are three machine types for different versions of
-  SunOS.  All are derived from Berkeley 4.2, meaning that you should
-  use -opsystem=bsd4-2.  Emacs 17 has run on all of them.  You will
-  need to use sun3 on Sun 2's running SunOS release 3.
-  For SunOS release 4 on a Sun 3, use -machine=sun3 and
-  -opsystem=sunos4.  See the file share-lib/SUNBUG for how to solve
-  problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* 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)
-/* This is the offset of the executable's text, from the start of the file.  */
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-/* In case we are using floating point, work together with crt0.c.  */
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE -fsoft
-#endif
-/* This line is needed if you are linking with X windows
-   and the library xlib was compiled to use the 68881.
-   For maximum cleanliness, don't edit this file;
-   instead, insert this line in config.h.  */
-/* #define START_FILES crt0.o /usr/lib/Mcrt1.o  */
-/* arch-tag: d0559a79-2285-4a78-ad68-9694264d0d8a
-   (do not change this comment) */
diff --git a/src/m/sun386.h b/src/m/sun386.h
deleted file mode 100644
index ed98960c809..00000000000
--- a/src/m/sun386.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* machine description file for Sun's 386-based RoadRunner.  This file borrows heavily from
-   "sun2.h", but since that file is heavily cpu-specific, it was easier
-   not to include it.
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, 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 s-sunos4-0.h for operating system version 4.0, and s-sunos4-1.h
-  for later versions.  See the file share-lib/SUNBUG for how to solve
-  problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END  */
-/* Say this machine is a bird */
-#ifndef roadrunner
-#define roadrunner
-#endif
-/* Actual cpu-specific defs */
-#include "intel386.h"
-/* 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)
-/* Underscores are not prepended to C symbols on this machine.  */
-#undef LDAV_SYMBOL
-#define LDAV_SYMBOL "avenrun"
-/* Must use the system's termcap.  It does special things.  */
-#define LIBS_TERMCAP -ltermcap
-/* Roadrunner uses 'COFF' format */
-#define COFF
-#define C_SWITCH_MACHINE -Bstatic       /* avoid dynamic linking */
-#define LD_SWITCH_MACHINE -n -Bstatic
-/* Get rid of the -e __start that s-sunos4.h does.  */
-#undef LD_SWITCH_SYSTEM
-#ifdef USG
-/* USG detects Solaris.  j.w.hawtin@lut.ac.uk says Solaris 2.1
-   on the 386 needs this.  */
-#define LIBS_MACHINE -lkvm
-#endif
-/* arch-tag: 861af4b4-ce5f-475e-876e-ebff6436a1fe
-   (do not change this comment) */
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
deleted file mode 100644
index ea3d9493504..00000000000
--- a/src/m/symmetry.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* machine description file for SEQUENT SYMMETRY machines
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988]
- * Modified the sequent.h file for the Sequent Symmetry machine.
- * Biggest change was to align the sections in the a.out to 4K
- * boundaries (this is the page size).
- */
-/* NOTICE: this file works for DYNIX release 3.0.12 on Sequent Symmetry
- * (Intel 80386) machines.  Hasn't been tested on anything else.
- */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-#include "intel386.h"
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE unsigned long
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define FSCALE  1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-/* Name of file the to look in
-   for the kernel symbol table (for load average) */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/dynix"
-/* Avoids a compiler bug */
-#define TAHOE_REGISTER_BUG
-/* 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.  Furthermore, the value written
-   in the a_text in the file must have N_ADDRADJ added to it.  */
-#define A_TEXT_OFFSET(HDR) (sizeof (HDR) + N_ADDRADJ (HDR))
-/* This is the offset of the executable's text, from the start of the file.  */
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-/* The file sections in the Symmetry a.out must be on 4K boundaries.
- */
-#define SEGSIZ 4096
-#define SECTION_ALIGNMENT       (SEGSIZ-1)
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-/* Cause compilations to be done in parallel in ymakefile.  */
-#define MAKE_PARALLEL &
-/* Define how to search all pty names.
-   This is for Dynix 3.0; delete next 5 definitions for older systems.  */
-#define PTY_MAJOR "pqrstuvwPQRSTUVW"
-#define PTY_MINOR "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define PTY_ITERATION                                   \
-  register int ma, mi;                                  \
-  for (ma = 0; ma < sizeof(PTY_MAJOR) - 1; ma++)        \
-    for (mi = 0; mi < sizeof(PTY_MINOR) - 1; mi++)
-#define PTY_NAME_SPRINTF \
-  sprintf (pty_name, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-#define PTY_TTY_NAME_SPRINTF \
-  sprintf (pty_name, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-/* arch-tag: 4169a89e-3764-4147-98df-1ba3bdd45a5b
-   (do not change this comment) */
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
deleted file mode 100644
index c8be8763fb5..00000000000
--- a/src/m/tad68k.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/* 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 */
-/* 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 / FSCALE) */
-/* 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 */  /* Karl Kleinpaste says this isn't needed.  */
-/* SysV has alloca in the PW library */
-#define LIB_STANDARD -lPW -lc
-/* 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 */
-/* Use Terminfo, not Termcap.  */
-#define TERMINFO
-/* TPIX extras */
-#define TPIX                            /* used in various source files */
-#define BSTRING                         /* we do have the BSTRING functions */
-#define CLASH_DETECTION                 /* we want to know about clashes */
-#undef ADDR_CORRECT                     /* don't need this bug fix */
-#define fchmod                          /* we don't have fchmod() */
-#define SECTION_ALIGNMENT (2048-1)      /* 2k boundaries required in unexec */
-#define SEGMENT_MASK (128*1024-1)       /* 128k offsets required in unexec */
-#define C_DEBUG_SWITCH -O               /* build with -O (TPIX has GCC 1.34) */
-#define BROKEN_TIOCGWINSZ               /* Don't try to use TIOCGWINSZ.  */
-/* omit next four lines if no TCP installed */
-#define select gnu_select               /* avoid select() name clash */
-#define HAVE_PTYS                       /* we do have PTYs if we have TCP */
-#define HAVE_SOCKETS                    /* we do have sockets if we have TCP */
-#define LIBS_SYSTEM -lsocket            /* get TCP networking functions */
-/* arch-tag: e0c09754-b0f2-48da-a8a5-aee3c94838f4
-   (do not change this comment) */
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
deleted file mode 100644
index 9b9271577fc..00000000000
--- a/src/m/tahoe.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* machine description file for tahoe.
-   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, 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=bsd4-2 or -opsystem=bsd4-3, depending on the version of
-Berkeley you are running.
-NOTE-END  */
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-#define WORDS_BIG_ENDIAN
-/* XINT must explicitly sign-extend */
-#define EXPLICIT_SIGN_EXTEND
-/* Say this machine is a tahoe */
-#ifndef tahoe
-#define tahoe
-#endif /* not tahoe */
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* crt0.c should use the vax-bsd style of entry, with no dummy args.  */
-#define CRT0_DUMMIES
-/* crt0.c should define a symbol `start' and do .globl with a dot.  */
-#define DOT_GLOBAL_START
-/* 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 triggers some stuff to avoid a compiler bug */
-#define TAHOE_REGISTER_BUG
-/* arch-tag: dd452693-80e1-413f-a164-0141eb68d831
-   (do not change this comment) */
diff --git a/src/m/targon31.h b/src/m/targon31.h
deleted file mode 100644
index 39e995b076d..00000000000
--- a/src/m/targon31.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* targon31 machine description file
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2-2"  */
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-/* #define m68k is defined by the Compiler */
-/* #define m68000 */
-/* 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 double */
-/* 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)
-/* 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 */
-/* 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 */
-/* Supposedly NO_REMAP is not needed with the following change.  */
-#define SEGMENT_MASK 0xffff
-#define SWITCH_ENUM_BUG 1
-/* arch-tag: f2438018-7d4e-4be5-b368-4bf342b7785b
-   (do not change this comment) */
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
deleted file mode 100644
index 6498238461d..00000000000
--- a/src/m/tek4300.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* machine description file for tek4300.
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="bsd4-3"  */
-/* 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.  */
-#undef 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.  */
-#ifndef tek4300
-#define tek4300
-#endif
-/* Use type int rather than a union, to represent Lisp_Object */
-#define NO_UNION_TYPE
-/* 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) (x)
-/* 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
-/* setjmp and longjmp can safely replace _setjmp and _longjmp, */
-#define _longjmp longjmp
-#define _setjmp setjmp
-/* The text segment always starts at a fixed address.
-   This way we don't need to have a label _start defined.  */
-#define TEXT_START 0
-/* The Tektronix exec struct for ZMAGIC files is struct zexec */
-#define EXEC_HDR_TYPE struct zexec
-/* The entry-point label (start of text segment) is `start', not `__start'.  */
-#define DEFAULT_ENTRY_ADDRESS start
-/* Use the system's malloc calls, gmalloc.c won't work for us. */
-#define SYSTEM_MALLOC
-/* In building xmakefile, "cc -E -g" forcibly reads from stdin.  Since we
-   can't remove the CFLAGS from that "cc -E" invocation, make sure we
-   never pass -g.  If you want to debug, remove the following, and fix
-   src/Makefile.in so it doesn't pass ${CFLAGS} when creating xmakefile. */
-#define C_DEBUG_SWITCH
-/* eirik@elf.ithaca.ny.us said this was needed in 19.22.  */
-#define NO_MODE_T
-/* Process groups work in the traditional BSD manner.  */
-#define BSD_PGRPS
-/* arch-tag: afa06e53-094c-4a19-9219-155f8ba4bbcc
-   (do not change this comment) */
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
deleted file mode 100644
index f351229292f..00000000000
--- a/src/m/tekxd88.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Configuration file for the Tektronix XD88 running UTekV 3.2e,
-   contributed by Kaveh Ghazi  (ghazi@caip.rutgers.edu)  1/15/93.
-   You probably need to use gnu make (version 3.63 or higher.)
-   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef m88000     /* Some 88k C compilers already define this */
-#define m88000
-#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 */
-/* 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 double */      /* No load average on XD88. */
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-/* #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) */
-/* 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 */
-/* 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
-#ifndef __GNUC__
-#  define C_OPTIMIZE_SWITCH -O
-#endif /* __GNUC__ */
-#undef NOMULTIPLEJOBS   /* we have job control */
-#define HAVE_SOCKETS    /* sockets are available */
-#define BROKEN_FIONREAD /* is this needed ? */
-#define BSTRING         /* its in libc but not declared in any header file. */
-#undef sigsetmask       /* XD88 has sigsetmask() */
-#undef LIB_X11_LIB      /* Don't use shared libraries defined in usg5-3.h */
-#undef LIBX11_SYSTEM
-#define HAVE_TERMIOS    /* We have termios. */
-#undef HAVE_TERMIO      /* Make sure termios ifdef code is used, not termio. */
-#define NO_TERMIO       /* Don't include both termios.h and termio.h */
-#define HAVE_PTYS       /* XD88 SysV has PTYs. */
-#define SYSV_PTYS       /* Requires <termios.h> */
-#ifdef ghs  /* Stands for "Green Hills Software", defined only in /bin/cc */
-/* -X18 means do not allocate programmer-defined local variables to a
-   register unless they are declared register.  (Copied from perl-4.036
-   Green Hills C hints file.  Might be needed for setjmp, I don't know.) */
-#  define C_SWITCH_MACHINE -X18
-/* We need /lib/default.ld so that /bin/ld can read its link directives. */
-#  define LD_SWITCH_SYSTEM /lib/default.ld
-#endif /* ghs */
-/* We need this to get dumping to work */
-#define KEEP_OLD_TEXT_SCNPTR
-/* arch-tag: fd3cebc3-2aed-4f8c-be9b-f37331c6e0ff
-   (do not change this comment) */
diff --git a/src/m/tower32.h b/src/m/tower32.h
deleted file mode 100644
index 01daada2423..00000000000
--- a/src/m/tower32.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* machine description file for the NCR Tower 32 running System V.2.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2-2"  */
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-#define m68000
-/* 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 / FSCALE) */
-/* 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 */
-/* Change some things to avoid bugs in compiler */
-#define SWITCH_ENUM_BUG 1
-/* The standard C library is -lcieee, not -lc.
-   Also use the PW library, which contains alloca.  */
-#define LIB_STANDARD -lPW -lcieee
-/* crt0.c should use the vax-bsd style of entry.  Beware that if you have
-   OS release 2.00.00 or later, *and* change src/ymakefile so that CFLAGS
-   includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH, you need to
-   uncomment CRT0_DUMMIES and C_OPTIMIZE_SWITCH below.  */
-/* With the optimizer OFF */
-#define CRT0_DUMMIES zero, bogus_fp,
-/* With the optimizer ON */
-/* #define CRT0_DUMMIES */
-/* #define C_OPTIMIZE_SWITCH -O2 */
-/* emacs's magic number isn't temacs's;
-   temacs is writable text (the default!).  */
-#include <asld.h>
-#define EXEC_MAGIC AOUT1MAGIC
-#define EXEC_PAGESIZE DATACLICK
-/* arch-tag: a08e7dea-d48e-44cc-b60d-c7f2e5187ff5
-   (do not change this comment) */
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
deleted file mode 100644
index ff209edab41..00000000000
--- a/src/m/tower32v3.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* machine description file for the NCR Tower 32 running System V.3.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/* 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-#define m68000
-/* 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 */
-/* 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 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 */
-#ifdef __GNUC__
-#define C_OPTIMIZE_SWITCH -O -fstrength-reduce -fomit-frame-pointer
-#define LIB_STANDARD -lc /lib/crtn.o
-#else
-/* This section is correct if you do *not* change src/ymakefile so that
-   CFLAGS includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH.  */
-#define C_DEBUG_SWITCH -g -O0
-#define LIB_STANDARD -lc -lPW /lib/crtn.o
-/* This section is correct if you do enable C_OPTIMIZE_SWITCH.  */
-/* #define C_OPTIMIZE_SWITCH -O2 */
-/* #define LIB_STANDARD -lc /lib/crtn.o */
-#endif
-/* The OS maps the data section far away from the text section.  */
-#define NO_REMAP
-#define TEXT_START 0
-#undef static
-#define START_FILES pre-crt0.o /lib/crt1.o
-/* The OS has an implementation of symlinks that is semantically different
-   from BSD, but for some silly reason it partly has the same syntax.  */
-#undef S_IFLNK
-/* The OS needs stream.h+ptem.h included in sysdep.c.  */
-#define NO_SIOCTL_H
-#define NEED_PTEM_H
-/* arch-tag: 3dff1355-7cb6-49e3-8834-85a369e4ea8f
-   (do not change this comment) */
diff --git a/src/m/ustation.h b/src/m/ustation.h
deleted file mode 100644
index 0ac833c28da..00000000000
--- a/src/m/ustation.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
-   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-3"  */
-/* 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.  */
-#undef 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:
-   vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
-   are the ones defined so far.  */
-/* Masscomp predefines mc68000. */
-#define m68000 mc68000
-/* 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.  */
-#undef EXPLICIT_SIGN_EXTEND
-/* 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))
-/* 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 data space precedes text space,
-   numerically.  */
-#undef 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.  */
-#undef NO_REMAP
-/* Name of file the to look in
-   for the kernel symbol table (for load average) */
-#define KERNEL_FILE "/unix"
-/* This triggers some stuff to avoid a compiler bug */
-#define MASSC_REGISTER_BUG
-/* Prevent -lg from being used for debugging.  Not implemented?  */
-#define LIBS_DEBUG
-/*
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- */
-#define HAVE_TERMIO
-/* -lnet is not standard library */
-#undef LIBS_SYSTEM
-/* Compiler's bug */
-#define SWITCH_ENUM_BUG
-/* Termcap is available */
-#define LIBS_TERMCAP -ltermcap
-#define EXEC_PAGESIZE 1024
-#define PURESIZE 130000
-#define BROKEN_SIGIO
-#define BROKEN_SIGTSTP
-/* arch-tag: 797f1d3e-3077-4eee-a81b-03fcf3a988fe
-   (do not change this comment) */
diff --git a/src/m/wicat.h b/src/m/wicat.h
deleted file mode 100644
index 3ac7b530739..00000000000
--- a/src/m/wicat.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* machine description file for WICAT machines.
-   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* 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.  */
-#undef 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:
-   vax, m68000, ns16000 are the ones defined so far.  */
-#ifndef m68000
-#define m68000
-#endif
-/* This flag is used only in alloca.s.  */
-#define WICAT
-/* 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.  */
-#undef LOAD_AVE_TYPE
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#undef LOAD_AVE_CVT
-/* 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.  */
-#undef 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.  */
-#undef NO_REMAP
-/* For WICAT, define TAHOE_REGISTER_BUG if you have a pre-4.2 C compiler */
-#define TAHOE_REGISTER_BUG
-/* pagesize definition */
-#define EXEC_PAGESIZE   0x1000
-/* Delete this for WICAT sys V releases before 2.0.  */
-#define LIB_STANDARD -lc-nofp
-/* Special magic number */
-#define EXEC_MAGIC      MC68ROMAGIC
-/* Special switches to give to ld.  */
-#define LD_SWITCH_MACHINE -e __start -N
-/* Sigh...cannot define this for WICAT cuz 0 length memcpy blows chunks */
-#undef BSTRING
-/*
- * Define optimflags if you want to optimize.
- *      - Set to null string for pre-4.2 C compiler
- *      - Set to "-O -Wopt,-O-f" for 4.2
- */
-#define C_OPTIMIZE_SWITCH /* -O -Wopt,-O-f */
-/* For WICAT version supporting PTYs and select (currently internal only) */
-#ifdef HAVE_PTYS
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-#endif
-/* there is a select() in libcurses.a that causes a conflict so use termlib */
-#ifdef HAVE_SELECT
-#undef TERMINFO
-#define LIBS_TERMCAP select.o -ltermlib
-#endif
-/* arch-tag: b181c512-0275-4d25-9bbc-be0c8ca7bcad
-   (do not change this comment) */
diff --git a/src/m/xps100.h b/src/m/xps100.h
deleted file mode 100644
index 3b378319ceb..00000000000
--- a/src/m/xps100.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* xps100.h for the Honeywell XPS100 running UNIX System V.2
-   Mark J. Hewitt (mjh@uk.co.kernel)
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  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, 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="usg5-2"  */
-/* 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:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-/* 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 / FSCALE) */
-/* 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 */
-/* 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
-#define TERMINFO
-#define SWITCH_ENUM_BUG
-#define LIB_STANDARD  -lc
-#define LD_SWITCH_MACHINE -X
-#define SECTION_ALIGNMENT (0x3ff)
-/* arch-tag: 42316eb5-74b2-4762-970a-e372c6a2783d
-   (do not change this comment) */
author	Dan Nicolaescu	2008-01-06 00:56:56 +0000
committer	Dan Nicolaescu	2008-01-06 00:56:56 +0000
commit	f3041af143f4ab74041fc918feee43aa8ac2da88 (patch)
tree	a84bdb93b8f941075b511480aa283e2847fbbcac /src/m
parent	37d6e31370557ab868033dde113f11b54994e576 (diff)
download	emacs-f3041af143f4ab74041fc918feee43aa8ac2da88.tar.gz emacs-f3041af143f4ab74041fc918feee43aa8ac2da88.zip