aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Sandiford <rsandifo@redhat.com>2004-11-06 22:34:00 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2004-11-06 22:34:00 +0000
commit28e9a3f3751b78cd2ccf68eb790f91d3cdc1da52 (patch)
treeab27915c970e8253842b24409c126c879cda92cd /gcc
parent3c871f3f9adb4ae4ee6df6218dd7a29a856b04c3 (diff)
downloadgcc-28e9a3f3751b78cd2ccf68eb790f91d3cdc1da52.zip
gcc-28e9a3f3751b78cd2ccf68eb790f91d3cdc1da52.tar.gz
gcc-28e9a3f3751b78cd2ccf68eb790f91d3cdc1da52.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/mips/mips.h26
2 files changed, 22 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27252b0..eac112a 100644
--- 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 974817f..2b4c62e 100644
--- 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"); \