* ecrt0.c: Remove code depending on m68000, not used anymore.

* fns.c (hash_remove): Make static.
* lisp.h (hash_remove): Don't prototype.

* m/ibmrs6000.h:
* m/ibms390x.h:
* m/macppc.h: Remove boilerplate comments.

* m/sparc.h (A_TEXT_OFFSET, A_TEXT_SEEK): Remove, only used on
Solaris, which does not need them.

* m/vax.h: Remove comments about unsupported systems.

* s/darwin.h: Reorganize ifdefs.

5 files changed, 31 insertions, 138 deletions

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 7268cf64441..c3474254281 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -22,15 +22,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    operating system this machine is likely to run.
    USUAL-OPSYS="aix3-1"  */
 
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#ifdef USG5_4
-#undef WORDS_BIG_ENDIAN
-#else
-#define WORDS_BIG_ENDIAN
-#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.  */
 
@@ -49,33 +40,40 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_REMAP
 
-#ifndef USG5_4
-#define TEXT_START 0x10000000
-#define TEXT_END 0
-#define DATA_START 0x20000000
-#define DATA_END 0
-#endif
-
 /* 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.  */
 
 #ifndef USG5_4
+#define TEXT_START 0x10000000
+#define TEXT_END 0
+#define DATA_START 0x20000000
+#define DATA_END 0
+#define WORDS_BIG_ENDIAN
 #define DATA_SEG_BITS 0x20000000
-#else
-#define DATA_SEG_BITS 0
-#endif
+#define C_SWITCH_MACHINE -D_BSD
 
-#undef ADDR_CORRECT
-#define ADDR_CORRECT(x) ((int)(x))
+/* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4.  */
+/* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid
+   linker error for updated X11R5 libraries, which references pthread library
+   which most machines don't have.  We use the name .inp instead of .imp
+   because .inp is a better convention to use in make-dist for naming
+   random input files.  */
+#ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
+#define LD_SWITCH_MACHINE -Wl,-bnodelcsect
+#endif /* THIS_IS_MAKEFILE */
 
-/* Here override various assumptions in ymakefile */
+/* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
+#if __GNUC__ == 2 && __GNUC_MINOR__ == 7
+#define LD_SWITCH_SITE -B/bin/
+#endif
 
-#ifndef USG5
-#define C_SWITCH_MACHINE -D_BSD
+#ifndef NLIST_STRUCT
+/* AIX supposedly doesn't use this interface, but on the RS/6000
+   it apparently does.  */
+#define NLIST_STRUCT
 #endif
 
-#ifdef AIX
 /* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
    on older versions of X where it happens to exist.  */
 #ifdef HAVE_LIBPTHREADS
@@ -84,13 +82,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
 #define LIBS_MACHINE -lrts -lIM -liconv
 #endif
-#else
-#ifdef USG5_4
+
+#else /* USG5_4 */
+#undef WORDS_BIG_ENDIAN
+#define DATA_SEG_BITS 0
 #define LIBS_MACHINE
-#else
-#define LIBS_MACHINE -lIM
-#endif
-#endif
+#endif /* USG5_4 */
+
+#undef ADDR_CORRECT
+#define ADDR_CORRECT(x) ((int)(x))
 
 #define START_FILES
 /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
@@ -106,36 +106,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define ORDINARY_LINK
 
-#ifndef USG5_4
-/* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4.  */
-/* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid
-   linker error for updated X11R5 libraries, which references pthread library
-   which most machines don't have.  We use the name .inp instead of .imp
-   because .inp is a better convention to use in make-dist for naming
-   random input files.  */
-#ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
-#ifdef AIX
-#define LD_SWITCH_MACHINE -Wl,-bnodelcsect
-#else /* not AIX */
-#ifdef HAVE_AIX_SMT_EXP
-#define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp,-bI:/usr/lpp/X11/bin/smt.exp
-#else
-#define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
-#endif
-#endif /* not AIX */
-#endif /* THIS_IS_MAKEFILE */
-
-/* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 7
-#define LD_SWITCH_SITE -B/bin/
-#endif
-
-#ifndef NLIST_STRUCT
-/* AIX supposedly doesn't use this interface, but on the RS/6000
-   it apparently does.  */
-#define NLIST_STRUCT
-#endif
-#endif /* USG5_4 */
-
 /* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
    (do not change this comment) */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index e7f9a98145f..bcddabd0aac 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -87,30 +87,6 @@ NOTE-END */
 
 #undef 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.
- */
-
-#undef NO_SOCK_SIGIO
-
-
-/* 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.  */
-
 /* On the 64 bit architecture, we can use 60 bits for addresses */
 
 #define VALBITS         60
diff --git a/src/m/macppc.h b/src/m/macppc.h
index eeb9990562e..fc2c8f9d361 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -27,11 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_ARG_ARRAY
 
-/* 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 */
-
 /* Data type of load average, as read out of kmem.  */
 
 #define LOAD_AVE_TYPE long
@@ -40,20 +35,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-/* 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 */
-
 #if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
 # define TEXT_END ({ extern int _etext; &_etext; })
 #endif
diff --git a/src/m/sparc.h b/src/m/sparc.h
index e75094fa7de..c4d7c0698f4 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -55,21 +55,6 @@ NOTE-END  */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
-/* This really belongs in s/sun.h.  */
-
-/* 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))
-
-#endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
-
 #ifdef __arch64__               /* GCC, 64-bit ABI.  */
 #define BITS_PER_LONG 64
 #ifdef __linux__
diff --git a/src/m/vax.h b/src/m/vax.h
index 7a08deb6830..d412deacd99 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -25,24 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 NOTE-START
 The vax (-machine=vax) runs zillions of different operating systems.
 
-Vax running Berkeley Unix (-opsystem=bsd4-1, -opsystem=bsd4-2 or
-                           -opsystem=bsd4-3)
-
-  Works.
-
-Vax running Ultrix (-opsystem=bsd4-2)
-
-  Works.  See under Ultrix in share-lib/MACHINES for problems using X
-  windows on Ultrix.
-
-Vax running System V rel 2 (-opsystem=usg5-2)
-
-  18.27 Works.
-
-Vax running System V rel 0 (-opsystem=usg5-0)
-
-  Works as of 18.36.
-
 Vax running VMS (-opsystem=vms)
 
   18.36 believed to work.  Addition of features is necessary to make