From 08b7ff1e1dda0bb35741ad8156bf31ba5151ddea Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Tue, 28 Apr 2015 04:44:09 +0000 Subject: always define HAVE_simple_return and HAVE_return gcc/ChangeLog: 2015-04-27 Trevor Saunders * 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 --- gcc/cfgrtl.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gcc/cfgrtl.c') diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 322d1a9..7027502 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -1705,21 +1705,19 @@ force_nonfallthru_and_redirect (edge e, basic_block target, rtx jump_label) { if (jump_label == ret_rtx) { -#ifdef HAVE_return + if (!HAVE_return) + gcc_unreachable (); + emit_jump_insn_after_setloc (gen_return (), BB_END (jump_block), loc); -#else - gcc_unreachable (); -#endif } else { gcc_assert (jump_label == simple_return_rtx); -#ifdef HAVE_simple_return + if (!HAVE_simple_return) + gcc_unreachable (); + emit_jump_insn_after_setloc (gen_simple_return (), BB_END (jump_block), loc); -#else - gcc_unreachable (); -#endif } set_return_jump_label (BB_END (jump_block)); } -- cgit v1.1