6 files changed, 14 insertions, 341 deletions

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 37ae8ebb148..cdf8599e9b6 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -146,7 +146,7 @@ Boston, MA 02110-1301, USA.  */
 #else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */
 
 #undef START_FILES
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 #else
 #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
@@ -158,7 +158,7 @@ Boston, MA 02110-1301, USA.  */
    versions of ld are one-pass linkers, we need to mention -lgcc twice,
    or else we risk getting unresolved externals.  */
 #undef LIB_STANDARD
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
 #else
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 7c0c577523e..443357966b6 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -152,10 +152,18 @@ NOTE-END */
 #define XPNTR(a) XUINT (a)
 
 #undef START_FILES
+#ifdef HAVE_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+#else
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+#endif
 
 #undef LIB_STANDARD
+#ifdef HAVE_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#else
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+#endif
 
 /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
    (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 6ea2bbc60c6..680a2cc106d 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -85,17 +85,6 @@ NOTE-END */
 
 #define DOT_GLOBAL_START
 
-#ifdef XENIX
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE short
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define LOAD_AVE_CVT(x) (((double) (x)) * 100.0 / FSCALE)
-
-#define FSCALE 256.0         /* determined by experimentation...  */
-#endif
-
-
 #ifdef SOLARIS2
 /* Data type of load average, as read out of kmem.  */
 #define LOAD_AVE_TYPE long
@@ -153,28 +142,6 @@ NOTE-END */
 
 /* #define VIRT_ADDR_VARIES */
 
-#ifdef XENIX
-/* 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
-
-/* Since cannot purify, use standard Xenix 386 startup code. */
-
-#define START_FILES     /lib/386/Sseg.o pre-crt0.o /lib/386/Scrt0.o
-
-/* These really use terminfo.  */
-
-#define LIBS_TERMCAP /lib/386/Slibcurses.a  \
-   /lib/386/Slibtinfo.a /lib/386/Slibx.a
-
-/* Standard libraries for this machine.  Since `-l' doesn't work in `ld'.  */
-/* '__fltused' is unresolved w/o Slibcfp.a */
-#define LIB_STANDARD /lib/386/Slibcfp.a /lib/386/Slibc.a
-#else /* not XENIX */
-
 /* this brings in alloca() if we're using cc */
 #ifdef USG
 #ifndef LIB_STANDARD
@@ -188,7 +155,6 @@ NOTE-END */
 #define NO_REMAP
 #define TEXT_START 0
 #endif /* USG */
-#endif /* not XENIX */
 
 #ifdef USG5_4
 #define DATA_SEG_BITS 0x08000000
diff --git a/src/m/mips.h b/src/m/mips.h
index 866a2a13742..f1401425603 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -130,7 +130,7 @@ NOTE-END  */
 
 /* Alter some of the options used when linking.  */
 
-#if !defined(NEWSOS5) && !defined(__linux__)
+#if !defined(__linux__)
 #ifdef BSD_SYSTEM
 
 /* DECstations don't have this library.
@@ -161,7 +161,7 @@ NOTE-END  */
 #endif
 
 #endif /* not BSD_SYSTEM */
-#endif /* not NEWSOS5 && not __linux__ */
+#endif /* not __linux__ */
 
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
@@ -173,7 +173,7 @@ NOTE-END  */
    ((int)(type) << VALBITS)                                             \
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
 
-#if !defined (NEWSOS5) && !defined (__linux__)
+#if !defined (__linux__)
 #ifdef USG
 
 /* Cancel certain parts of standard sysV support.  */
@@ -213,7 +213,7 @@ NOTE-END  */
 #undef HAVE_UNION_WAIT
 #endif /* BSD_SYSTEM */
 
-#endif /* not NEWSOS5 && not __linux__ */
+#endif /* not __linux__ */
 
 /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
    (do not change this comment) */
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
deleted file mode 100644
index de998e9fa31..00000000000
--- a/src/m/sequent-ptx.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* machine description file for SEQUENT machines running DYNIX/ptx
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, 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="ptx"  */
-
-#include "intel386.h"
-
-/* Define how to take a char and sign-extend into an int.
-   On machines where char is signed, this is a no-op.  */
-/* CHECK THIS */
-#define SIGN_EXTEND_CHAR(c) (c)
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others.  */
-
-/* BTW: ptx defines _SEQUENT_, i386 */
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* crt0.c should use the vax-bsd style of entry, with these dummy args.  */
-/* Already defined.  Assume prior definition works for PTX.  */
-#if 0
-#undef CRT0_DUMMIES
-#define CRT0_DUMMIES dummy1, dummy2, dummy3,
-#endif
-
-/* 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.  */
-
-#undef LOAD_AVE_TYPE
-#define LOAD_AVE_TYPE unsigned long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#undef FSCALE
-#define FSCALE  1000.0
-#undef LOAD_AVE_CVT
-#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.  */
-/* On PTX, can't seem to get a valid executable unless NO_REMAP is
-   defined.  This did work in the Sequent patched Emacs 18.57.  */
-#ifndef NO_REMAP
-#define NO_REMAP
-#endif
-/* #undef NO_REMAP */
-
-/* If a valid PTX executable could be dumped without NO_REMAP defined,
-   here's a guess at some defines to make it work.  */
-#ifndef NO_REMAP
-
-/* PTX has getpagesize() but it returns 296. Using the default method of
-   including getpagesize.h in unexec.c returns 4096 which seems more
-   reasonable.  */
-#undef HAVE_GETPAGESIZE
-
-/* Override magic number for a.out header.  */
-#define EXEC_MAGIC 0411         /* from a.out.h: separated I&D */
-
-#define ADJUST_TEXT_SCNHDR_SIZE
-#define ADJUST_TEXTBASE
-
-/* The file sections in the Symmetry a.out must be on 4K boundaries.  */
-/* #define DATA_SECTION_ALIGNMENT       (4096-1) */
-
-#endif  /* ifndef NO_REMAP */
-
-/* Avoids a compiler bug.  */
-#define TAHOE_REGISTER_BUG
-
-/* (short) negative-int doesn't sign-extend correctly.  */
-#define SHORT_CAST_BUG
-
-/* Cause compilations to be done in parallel in ymakefile.  */
-#define MAKE_PARALLEL $&
-
-/* Use terminfo library.  */
-#define LIBS_TERMCAP -ltermlib
-
-/* arch-tag: 0494629b-7e11-4f6f-865f-62254ac46099
-   (do not change this comment) */
diff --git a/src/m/sequent.h b/src/m/sequent.h
deleted file mode 100644
index 97df4da6e09..00000000000
--- a/src/m/sequent.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* machine description file for SEQUENT BALANCE machines
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, 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 on newer systems.
-NOTE-END */
-
-/* NOTE: this file works for DYNIX release 2.0
-          (not tested on 1.3) on NS32000's */
-
-/* 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.  */
-
-/* BTW: DYNIX defines sequent, ns32000, and ns16000 (GENIX compatibility) */
-#ifndef sequent         /* pre DYNIX 2.1 releases */
-# define sequent
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* crt0.c should use the vax-bsd style of entry, with these dummy args.  */
-
-#define CRT0_DUMMIES bogus_fp,
-
-/* 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
-
-/* 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)
-
-/* 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 */
-
-/* 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))
-
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-
-/* Cause compilations to be done in parallel in ymakefile.  */
-#define MAKE_PARALLEL &
-
-/* Say that mailer interlocking uses flock.  */
-#define MAIL_USE_FLOCK
-
-/* On many 4.2-based systems, there's a rather tricky bug
- * with the interpretation of the pid/pgrp value given to
- * the F_SETOWN fcntl() call.  It works as documented EXCEPT
- * when applied to filedescriptors for sockets, in which case
- * the sign must be reversed.  If your emacs subprocesses get
- * SIGIO's when they shouldn't, while running on a socket
- * (e.g. under X windows), you should probably define this.
- */
-
-#define F_SETOWN_SOCK_NEG
-
-/* 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.
- */
-
-#define NO_SOCK_SIGIO
-
-/* 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 (ptyname, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-#define PTY_TTY_NAME_SPRINTF \
-  sprintf (ptyname, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-
-/* arch-tag: 81caea48-aa64-4021-9544-e969dea71ee8
-   (do not change this comment) */