diff options
| author | Trevor Saunders <tbsaunde+gcc@tbsaunde.org> | 2015-04-28 04:44:09 +0000 |
|---|---|---|
| committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2015-04-28 04:44:09 +0000 |
| commit | 08b7ff1e1dda0bb35741ad8156bf31ba5151ddea (patch) | |
| tree | 996ea71baffdec033124a780519ec47ed3bb21cf /gcc/reorg.c | |
| parent | a3699d669abd4543fdc3c4607e2d0550e67e52ba (diff) | |
| download | gcc-08b7ff1e1dda0bb35741ad8156bf31ba5151ddea.zip gcc-08b7ff1e1dda0bb35741ad8156bf31ba5151ddea.tar.gz gcc-08b7ff1e1dda0bb35741ad8156bf31ba5151ddea.tar.bz2 | |
always define HAVE_simple_return and HAVE_return
gcc/ChangeLog:
2015-04-27 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* bb-reorder.c (HAVE_return): Don't check if its undefined.
* defaults.h (gen_simple_return): New function.
(gen_simple_return): Likewise.
(HAVE_return): Add default definition to false.
(HAVE_simple_return): Likewise.
* cfgrtl.c (force_nonfallthru_and_redirect): Remove checks if
HAVE_return and HAVE_simple_return are defined.
* function.c (gen_return_pattern): Likewise.
(convert_jumps_to_returns): Likewise.
(thread_prologue_and_epilogue_insns): Likewise.
* reorg.c (find_end_label): Likewise.
(dbr_schedule): Likewise.
* shrink-wrap.c: Likewise.
* shrink-wrap.h: Likewise.
From-SVN: r222505
Diffstat (limited to 'gcc/reorg.c')
| -rw-r--r-- | gcc/reorg.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/gcc/reorg.c b/gcc/reorg.c index 4922a77..a44d4a3 100644 --- a/gcc/reorg.c +++ b/gcc/reorg.c @@ -485,11 +485,7 @@ find_end_label (rtx kind) else { #ifdef HAVE_epilogue - if (HAVE_epilogue -#ifdef HAVE_return - && ! HAVE_return -#endif - ) + if (HAVE_epilogue && ! HAVE_return) /* The RETURN insn has its delay slot filled so we cannot emit the label just before it. Since we already have an epilogue and cannot emit a new RETURN, we cannot @@ -500,7 +496,6 @@ find_end_label (rtx kind) /* Otherwise, make a new label and emit a RETURN and BARRIER, if needed. */ emit_label (label); -#ifdef HAVE_return if (HAVE_return) { /* The return we make may have delay slots too. */ @@ -511,7 +506,6 @@ find_end_label (rtx kind) if (num_delay_slots (insn) > 0) obstack_ptr_grow (&unfilled_slots_obstack, insn); } -#endif } *plabel = label; } @@ -3825,12 +3819,8 @@ dbr_schedule (rtx_insn *first) delete_related_insns (function_simple_return_label); need_return_insns = false; -#ifdef HAVE_return need_return_insns |= HAVE_return && function_return_label != 0; -#endif -#ifdef HAVE_simple_return need_return_insns |= HAVE_simple_return && function_simple_return_label != 0; -#endif if (need_return_insns) make_return_insns (first); |