diff options
author | tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-21 01:14:59 +0000 |
---|---|---|
committer | tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-21 01:14:59 +0000 |
commit | 0e9d0aebcf321eead3b4d7c2a230316e1831f5ed (patch) | |
tree | 1ad11b5be857c590795e4e70b426a9fd07f93184 /gcc | |
parent | 9c80fc9f5e37bad0031260fd8c70356dcd35b46b (diff) | |
download | gcc-0e9d0aebcf321eead3b4d7c2a230316e1831f5ed.tar.gz |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227050 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/reorg.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 87cccef145d..5debccad108 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 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. * targhooks.c (default_have_conditional_execution): Adjust. diff --git a/gcc/reorg.c b/gcc/reorg.c index 1c60e13167e..cdaa60cda9e 100644 --- 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; |