From 4bccb39ebaecc3c91ea8aee58dc0c71d5a7e3b95 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 25 Jun 2015 17:18:12 +0000 Subject: Makefile.in (TARGET_DEF): Add target-insns.def. gcc/ * Makefile.in (TARGET_DEF): Add target-insns.def. (.PRECIOUS, simple_rtl_generated_h): Add insn-target-def.h. (build/gentarget-def.o): New rule. (genprogrtl): Add target-def. * target-insns.def, gentarget-def.c: New files. * target.def: Add targetm.have_* and targetm.gen_* hooks, based on the contents of target-insns.def. * defaults.h (HAVE_simple_return, gen_simple_return): Delete. (HAVE_return, gen_return): Delete. * target-def.h: Include insn-target-def.h. * cfgrtl.c (force_nonfallthru_and_redirect): Use targetm interface instead of direct calls. Rely on them to do the appropriate assertions. * function.c (gen_return_pattern): Likewise. Return an rtx_insn *. (convert_jumps_to_returns): Use targetm interface instead of direct calls. (thread_prologue_and_epilogue_insns): Likewise. * reorg.c (find_end_label, dbr_schedule): Likewise. * shrink-wrap.h (SHRINK_WRAPPING_ENABLED): Likewise. * shrink-wrap.c (convert_to_simple_return): Likewise. (try_shrink_wrapping): Use SHRINK_WRAPPING_ENABLED. From-SVN: r224979 --- gcc/shrink-wrap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcc/shrink-wrap.h') diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h index 5e7fac9..dda9b92 100644 --- a/gcc/shrink-wrap.h +++ b/gcc/shrink-wrap.h @@ -36,7 +36,8 @@ extern void convert_to_simple_return (edge entry_edge, edge orig_entry_edge, bitmap_head bb_flags, rtx_insn *returnjump, vec unconverted_simple_returns); -#define SHRINK_WRAPPING_ENABLED (flag_shrink_wrap && HAVE_simple_return) +#define SHRINK_WRAPPING_ENABLED \ + (flag_shrink_wrap && targetm.have_simple_return ()) #endif /* GCC_SHRINK_WRAP_H */ -- cgit v1.1