re PR target/16830 (Including <sys/immu.h> with -mabi=n32 causes an error.)

	PR target/16830
	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Don't define the
	R3000 and R4000 macros on IRIX.

From-SVN: r90195

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27252b0568d0c10f5f2ded038228e6cecd6fb223..eac112a357a6b848b2df6bfa39ee95fbf32548e5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-06  Richard Sandiford  <rsandifo@redhat.com>
+
+       PR target/16830
+       * config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Don't define the
+       R3000 and R4000 macros on IRIX.
+
 2004-11-06  Andreas Schwab  <schwab@suse.de>
 
        PR target/16286

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 974817f8518886dbd9604a2099d77dcdf2817fbd..2b4c62ef6f0af225b8b7f370951070435d3cb976 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -393,18 +393,24 @@ extern const struct mips_cpu_info *mips_tune_info;
       if (!flag_iso)                                           \
        builtin_define ("mips");                                \
                                                                \
-      /* Treat _R3000 and _R4000 like register-size defines,   \
-        which is how they've historically been used.  */       \
       if (TARGET_64BIT)                                                \
+       builtin_define ("__mips64");                            \
+                                                               \
+      if (!TARGET_IRIX)                                                \
        {                                                       \
-         builtin_define ("__mips64");                          \
-         builtin_define_std ("R4000");                         \
-         builtin_define ("_R4000");                            \
-       }                                                       \
-      else                                                     \
-       {                                                       \
-         builtin_define_std ("R3000");                         \
-         builtin_define ("_R3000");                            \
+         /* Treat _R3000 and _R4000 like register-size         \
+            defines, which is how they've historically         \
+            been used.  */                                     \
+         if (TARGET_64BIT)                                     \
+           {                                                   \
+             builtin_define_std ("R4000");                     \
+             builtin_define ("_R4000");                        \
+           }                                                   \
+         else                                                  \
+           {                                                   \
+             builtin_define_std ("R3000");                     \
+             builtin_define ("_R3000");                        \
+           }                                                   \
        }                                                       \
       if (TARGET_FLOAT64)                                      \
        builtin_define ("__mips_fpr=64");                       \