On Mon, Jul 06, 2015 at 08:11:25AM -0400, tbsaunde+...@tbsaunde.org wrote: > @@ -1327,7 +1322,7 @@ combine_instructions (rtx_insn *f, unsigned int nregs) > We need this special code because data flow connections > via CC0 do not get entered in LOG_LINKS. */ > > - if (JUMP_P (insn) > + if (HAVE_cc0 && JUMP_P (insn) > && (prev = prev_nonnote_insn (insn)) != 0 > && NONJUMP_INSN_P (prev) > && sets_cc0_p (PATTERN (prev)))
As before (in 6/6), please respect formatting rules. > @@ -5382,10 +5375,8 @@ subst (rtx x, rtx from, rtx to, int in_dest, int > in_cond, int unique_copy) > && ! (code == SUBREG > && MODES_TIEABLE_P (GET_MODE (x), > GET_MODE (SUBREG_REG (to)))) > -#if HAVE_cc0 > - && ! (code == SET && i == 1 && XEXP (x, 0) == cc0_rtx) > -#endif > - ) > + && (!HAVE_cc0 || (! (code == SET && i == 1 > + && XEXP (x, 0) == cc0_rtx)))) Esp. for things like this :-) > -#if HAVE_cc0 > - && (! reg_mentioned_p (cc0_rtx, SET_SRC (set)) > - || ((cc0_setter = prev_cc0_setter (tem_insn)) != > NULL > - && sets_cc0_p (PATTERN (cc0_setter)) > 0)) > -#endif > - ) > + && (!HAVE_cc0 > + || (! reg_mentioned_p (cc0_rtx, SET_SRC (set)) > + || ((cc0_setter = prev_cc0_setter (tem_insn)) > != NULL > + && sets_cc0_p (PATTERN (cc0_setter)) > > 0)))) Line too long now. This really wants a rewrite anyway, assignment in conditionals, ewww. And it will only look worse if you just wrap the lines. But please fix the other formatting problems. Segher
