remove another #if for HAVE_cc0

gcc/ChangeLog:

2015-08-20  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* reorg.c (relax_delay_slots): Don't use #if to check value of
	HAVE_cc0.

From-SVN: r227050

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87cccef145de9487d2b2dc81d9302664f2704983..5debccad1081118eea4e06fd58fb796e68c91e92 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-20  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * reorg.c (relax_delay_slots): Don't use #if to check value of
+       HAVE_cc0.
+
 2015-08-20  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * genconfig.c (main): Always define HAVE_CONDITIONAL_EXECUTION.

diff --git a/gcc/reorg.c b/gcc/reorg.c
index 1c60e13167e74bd9bdf7988c2ed371a1df5acf57..cdaa60cda9ebb82b612dded4fdf15ea5a1400047 100644 (file)
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -3445,15 +3445,13 @@ relax_delay_slots (rtx_insn *first)
          && ! condjump_in_parallel_p (delay_jump_insn)
          && prev_active_insn (target_label) == insn
          && ! BARRIER_P (prev_nonnote_insn (target_label))
-#if HAVE_cc0
          /* If the last insn in the delay slot sets CC0 for some insn,
             various code assumes that it is in a delay slot.  We could
             put it back where it belonged and delete the register notes,
             but it doesn't seem worthwhile in this uncommon case.  */
-         && ! find_reg_note (XVECEXP (pat, 0, XVECLEN (pat, 0) - 1),
-                             REG_CC_USER, NULL_RTX)
-#endif
-         )
+         && (!HAVE_cc0
+             || ! find_reg_note (XVECEXP (pat, 0, XVECLEN (pat, 0) - 1),
+                                 REG_CC_USER, NULL_RTX)))
        {
          rtx_insn *after;
          int i;