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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92561 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5f9c5d..287eb53 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
index de3f0cd..4ca547d 100644 (file)
--- a/gcc/config/mips/linux.h
+++ b/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");                       \

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index fd42276..6281985 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/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");                                        \

diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h
index 9d75e8e..9db40e8 100644 (file)
--- a/gcc/config/mips/netbsd.h
+++ b/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");                    \
                                                        \

diff --git a/gcc/config/mips/openbsd.h b/gcc/config/mips/openbsd.h
index 7faeeb5..5b27e07 100644 (file)
--- a/gcc/config/mips/openbsd.h
+++ b/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.  */