(START_FILES, LIB_STANDARD): Don't define if USG5_4.

[gnu-emacs] / src / m / iris4d.h

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e90381d8681449df900b7f5aa1b5971d9650fd01..2b0ab628bf1564e048ce60f7bd8db4bb20503bfd 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -5,7 +5,7 @@ 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -106,7 +106,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define neither one if an assembler-language alloca
    in the file alloca.s should be used.  */
 
-#define C_ALLOCA
+/* #define C_ALLOCA */  /* Sjoerd.Mullender@cwi.nl says no need.  */
 /* #define HAVE_ALLOCA */
 
 /* Define NO_REMAP if memory segmentation makes it not work well
@@ -119,7 +119,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
 
+#ifdef USG5_4
+#undef UNEXEC
+#define UNEXEC unexelfsgi.o
+#else
 #define UNEXEC unexmips.o
+#endif
 
 #define TEXT_START 0x400000
 
@@ -141,15 +146,21 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    in which crt1.o and crt1.n should be used.  */
 #define HAVE_CRTN
 
+/* When you *do* link with -lbsd, you *still* get System V getpgrp, unless:
+   you define _BSD_COMPAT, -or- you call `BSDgetpgrp' explicitly.
+   Emacs does the latter.  */
+
+#ifndef USG5_4
 #ifdef HAVE_CRTN
 /* Must define START-FILES so that the linker can find /usr/lib/crt0.o.  */
 #define START_FILES pre-crt0.o /usr/lib/crt1.o
-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o
+#define LIB_STANDARD -lc /usr/lib/crtn.o
 #else
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
 /* The entry-point label (start of text segment) is `start', not `__start'.  */
 #define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD -lbsd -lc
+#define LIB_STANDARD -lc
+#endif
 #endif
 \f
 /* Use terminfo instead of termcap.  */