mips.h (TARGET_CPU_CPP_BUILTINS): Add assert for machine=mips for !TARGET_IRIX.

2004-12-23  Eric Christopher  <echristo@redhat.com>

	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Add
	assert for machine=mips for !TARGET_IRIX.
	* config/mips/linux.h: Remove machine=mips assert.
	* config/mips/netbsd.h: Ditto.
	* config/mips/openbsd.h: Ditto.

From-SVN: r92561

gcc/ChangeLog

+2004-12-23  Eric Christopher  <echristo@redhat.com>
+
+	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Add
+	assert for machine=mips for !TARGET_IRIX.
+	* config/mips/linux.h: Remove machine=mips assert.
+	* config/mips/netbsd.h: Ditto.
+	* config/mips/openbsd.h: Ditto.
+
 2004-12-23  Dale Johannesen  <dalej@apple.com>
 
 	* tree.c (iterative_hash_expr):  Canonicalize builtins.
@@ -129,7 +137,7 @@
 	later sse generations.  Disabling mmx also disables 3dnow.
 
 2004-12-22  Daniel Berlin  <dberlin@dberlin.org>
-	
+
 	* tree-inline.c (struct inline_data): Remove inlined_fns.
 	(expand_call_inline): Remove dead code setting
 	inlined_fns.

gcc/config/mips/linux.h

@@ -61,7 +61,6 @@ Boston, MA 02111-1307, USA.  */
 	    builtin_define ("__PIC__");				\
 	    builtin_define ("__pic__");				\
 	  }							\
-        builtin_assert ("machine=mips");			\
 	/* The GNU C++ standard library requires this.  */	\
 	if (c_dialect_cxx ())					\
 	  builtin_define ("_GNU_SOURCE");			\

gcc/config/mips/mips.h

@@ -384,6 +384,10 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define TARGET_CPU_CPP_BUILTINS()				\
   do								\
     {								\
+      /* Everyone but IRIX defines this to mips.  */            \
+      if (!TARGET_IRIX)                                         \
+        builtin_assert ("machine=mips");                        \
+                                                                \
       builtin_assert ("cpu=mips");				\
       builtin_define ("__mips__");     				\
       builtin_define ("_mips");					\

gcc/config/mips/netbsd.h

@@ -35,7 +35,6 @@ Boston, MA 02111-1307, USA.  */
       NETBSD_OS_CPP_BUILTINS_ELF();			\
       builtin_define ("__NO_LEADING_UNDERSCORES__");	\
       builtin_define ("__GP_SUPPORT__");		\
-      builtin_assert ("machine=mips");			\
       if (TARGET_LONG64)				\
 	builtin_define ("__LONG64");			\
 							\

gcc/config/mips/openbsd.h

@@ -52,7 +52,6 @@ Boston, MA 02111-1307, USA.  */
 	builtin_define ("__OpenBSD__");			\
 	builtin_assert ("system=unix");			\
 	builtin_assert ("system=OpenBSD");		\
-	builtin_assert ("machine=mips");			\
 } while (0)
 
 /* Layout of source language data types.  */