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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 586c463df20f9b3bf39760520c1714ce9f3fc2e7..6c3ba6ddaf27afd860141df889cf4262e184e02f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-07  Richard Sandiford  <rsandifo@redhat.com>
+
+       * 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  <rsandifo@redhat.com>
 
        * 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 beb7250f6a6cdc1da86896107b15e882afd5d8d7..09d826a94d72d775c41a9d68dc7f07fee380eb97 100644 (file)
--- 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 e23abf1658d952526a300e8f57a0cb9e503e2210..cdde774673b2c8d2d69db609382eec408bd33e5e 100644 (file)
--- 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                            \