From afa36a4d013d601b90278ebb1de44b3b32c3ea83 Mon Sep 17 00:00:00 2001
From: Michael Meissner <meissner@gcc.gnu.org>
Date: Sat, 21 Mar 1992 17:03:44 +0000
Subject: [PATCH] *** empty log message ***

From-SVN: r546
---
 gcc/config/mips/iris3.h   |  6 ++++--
 gcc/config/mips/news5.h   | 11 ++++-------
 gcc/config/mips/osfrose.h |  4 +++-
 gcc/config/mips/ultrix.h  |  4 +++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gcc/config/mips/iris3.h b/gcc/config/mips/iris3.h
index d5d21483e9a..962d49fa4e8 100644
--- a/gcc/config/mips/iris3.h
+++ b/gcc/config/mips/iris3.h
@@ -42,15 +42,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ASM_SPEC "\
 %{!mgas: \
-	%{!mrnames: -nocpp} \
+	%{!mrnames: %{!.s:-nocpp} %{.s: %{cpp} %{nocpp}}} \
 	%{pipe: %e-pipe is not supported.} \
+	%{mips1} %{mips2} %{mips3} \
 	%{O:-O2} %{O1:-O2} %{O2:-O2} %{O3:-O3} \
 	%{g} %{g0} %{g1} %{g2} %{g3} %{v} %{K}} \
 %{G*}"
 
 #define LINK_SPEC "\
 %{G*} \
-%{!mgas: %{bestGnum}}"
+%{!mgas: %{mips1} %{mips2} %{mips3} \
+	 %{bestGnum}}"
 
 /* Always use 1 for .file number.  I [meissner@osf.org] wonder why
    IRIS needs this.  */
diff --git a/gcc/config/mips/news5.h b/gcc/config/mips/news5.h
index fa5f98919dd..606389be021 100644
--- a/gcc/config/mips/news5.h
+++ b/gcc/config/mips/news5.h
@@ -19,16 +19,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define MIPS_SYSV
 
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -Dsony -Dsonyrisc -DMIPSEB"
+#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -Dsony -Dsonyrisc -DMIPSEB -DSYSTYPE_SYSV"
 
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
 
 #define CPP_SPEC "\
-%{!ansi: %{!ZBSD43: -DSYSTYPE_SYSV} \
-         %{ZBSD43:  -DSYSTYPE_BSD43 -DSYSTYPE_BSD}} \
-%{!ZBSD43: -D__SYSTYPE_SYSV__} \
-%{ZBSD43:  -D__SYSTYPE_BSD43__ -D__SYSTYPE_BSD__} \
-%{!nostdinc: %{ZBSD43: -I/usr/bsdinclude}} \
 %{.cc:	-D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS} \
 %{.cxx:	-D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS} \
 %{.C:	-D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS} \
@@ -38,7 +33,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define LINK_SPEC "\
 %{G*} \
-%{!mgas: %{EB} %{!EB:-EB} %{EL: %e-EL not supported} %{bestGnum}}"
+%{!mgas: %{mips1} %{mips2} %{mips3} \
+	 %{EB} %{!EB:-EB} %{EL: %e-EL not supported} \
+	 %{bestGnum}}"
 		    
 #define LIB_SPEC "\
 %{ZBSD43: -L/usr/ucblib -lucb -lresolv -lsocket -lnsl} \
diff --git a/gcc/config/mips/osfrose.h b/gcc/config/mips/osfrose.h
index 09fafdc0fe0..c4ba111ac33 100644
--- a/gcc/config/mips/osfrose.h
+++ b/gcc/config/mips/osfrose.h
@@ -29,7 +29,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 	%{pipe:%e:-pipe not supported} \
 	%{EL} %{!EL:-EL} \
 	%{EB: %e-EB not supported} \
-	%{!mrnames: -nocpp} \
+	%{!mrnames: %{!.s:-nocpp} %{.s: %{cpp} %{nocpp}}} \
+	%{mips1} %{mips2} %{mips3} \
 	%{O:-O2} %{O1:-O2} %{O2:-O2} %{O3:-O3} \
 	%{g} %{g0} %{g1} %{g2} %{g3} \
 	%{K} %{Q}} \
@@ -57,6 +58,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{mmips-as: \
 	%{EL} %{!EL: -EL} \
 	%{EB: %e-EB not supported} \
+	%{mips1} %{mips2} %{mips3} \
 	%{bestGnum}} \
 %{!mmips-as: \
  	%{v*: -v} \
diff --git a/gcc/config/mips/ultrix.h b/gcc/config/mips/ultrix.h
index d74f4b036de..dec658c48ef 100644
--- a/gcc/config/mips/ultrix.h
+++ b/gcc/config/mips/ultrix.h
@@ -24,10 +24,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ASM_SPEC "\
 %{!mgas: \
-	%{!mrnames: -nocpp} \
+	%{!mrnames: %{!.s:-nocpp} %{.s: %{cpp} %{nocpp}}} \
 	%{pipe:%e:-pipe not supported} \
 	%{EL} %{!EL:-EL} \
 	%{EB: %e-EB not supported} \
+	%{mips1} %{mips2} %{mips3} \
 	%{O:-O2} %{O1:-O2} %{O2:-O2} %{O3:-O3} \
 	%{g} %{g0} %{g1} %{g2} %{g3} %{v} %{K}} \
 %{G*}"
@@ -45,6 +46,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{!mgas: \
 	%{EL} %{!EL: -EL} \
 	%{EB: %e-EB not supported} \
+	%{mips1} %{mips2} %{mips3} \
 	%{bestGnum}}"
 
 #define LIB_SPEC "%{p:-lprof1} %{pg:-lprof1} -lc"