From 5c8a81d5a8a462b4648491110c0bee8ae2c89d0a Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 7 May 2004 15:06:16 +0000 Subject: [PATCH] mips.h (ISA_HAS_BRANCHLIKELY): Remove TARGET_MIPS5500. * config/mips/mips.h (ISA_HAS_BRANCHLIKELY): Remove TARGET_MIPS5500. * config/mips/mips.c (override_options): Disable branch likely instructions if TUNE_MIPS5500. From-SVN: r81624 --- gcc/ChangeLog | 6 ++++++ gcc/config/mips/mips.c | 2 +- gcc/config/mips/mips.h | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 586c463df20..6c3ba6ddaf2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-05-07 Richard Sandiford + + * config/mips/mips.h (ISA_HAS_BRANCHLIKELY): Remove TARGET_MIPS5500. + * config/mips/mips.c (override_options): Disable branch likely + instructions if TUNE_MIPS5500. + 2004-05-07 Richard Sandiford * config/mips/mips.c (override_options): Allow the hi and lo registers diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index beb7250f6a6..09d826a94d7 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -4744,7 +4744,7 @@ override_options (void) -mbranch-likely. */ if (ISA_HAS_BRANCHLIKELY && !(ISA_MIPS32 || ISA_MIPS32R2 || ISA_MIPS64) - && !(TUNE_SB1)) + && !(TUNE_MIPS5500 || TUNE_SB1)) target_flags |= MASK_BRANCHLIKELY; else target_flags &= ~MASK_BRANCHLIKELY; diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index e23abf1658d..cdde774673b 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -858,8 +858,7 @@ extern const struct mips_cpu_info *mips_tune_info; /* ISA has branch likely instructions (eg. mips2). */ /* Disable branchlikely for tx39 until compare rewrite. They haven't been generated up to this point. */ -#define ISA_HAS_BRANCHLIKELY (!ISA_MIPS1 \ - && !TARGET_MIPS5500) +#define ISA_HAS_BRANCHLIKELY (!ISA_MIPS1) /* ISA has the conditional move instructions introduced in mips4. */ #define ISA_HAS_CONDMOVE ((ISA_MIPS4 \