From e90bedf52c86a7b4e2e0a1f8a5a1450725cb95b6 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Wed, 21 Oct 2015 21:05:02 +0000 Subject: unconditionally compile most of the delay slot code gcc/ChangeLog: 2015-10-21 Trevor Saunders * cfgrtl.c (pass_free_cfg::execute): Adjust. * final.c (dbr_sequence_length): Always define. (shorten_branches): Adjust. * genattr-common.c (main): Always define DELAY_SLOTS. * genattr.c (main): Unconditionally declare functions and define macros related to delay slots. * genattrtab.c (write_eligible_delay): Adjust. (main): Always write out delay slot functions. * opts.c (default_options_table): Adjust. * reorg.c (redirect_with_delay_slots_safe_p): Likewise. (redirect_with_delay_list_safe_p): Likewise. (fill_simple_delay_slots): Likewise. (fill_slots_from_thread): Likewise. (make_return_insns): Likewise. (dbr_schedule): Likewise. (rest_of_handle_delay_slots): Likewise. (pass_delay_slots::gate): Likewise. * toplev.c (process_options): Likewise. From-SVN: r229145 --- gcc/genattrtab.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'gcc/genattrtab.c') diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c index 932b18b1237..8d1fa6c9bbf 100644 --- a/gcc/genattrtab.c +++ b/gcc/genattrtab.c @@ -4449,7 +4449,7 @@ write_eligible_delay (FILE *outf, const char *kind) " rtx_insn *candidate_insn, int flags ATTRIBUTE_UNUSED)\n", kind); fprintf (outf, "{\n"); - fprintf (outf, " rtx_insn *insn;\n"); + fprintf (outf, " rtx_insn *insn ATTRIBUTE_UNUSED;\n"); fprintf (outf, "\n"); fprintf (outf, " gcc_assert (slot < %d);\n", max_slots); fprintf (outf, "\n"); @@ -5240,8 +5240,7 @@ main (int argc, char **argv) } /* Expand DEFINE_DELAY information into new attribute. */ - if (num_delays) - expand_delays (); + expand_delays (); /* Make `insn_alternatives'. */ int num_insn_codes = get_num_insn_codes (); @@ -5307,14 +5306,9 @@ main (int argc, char **argv) /* Write out delay eligibility information, if DEFINE_DELAY present. (The function to compute the number of delay slots will be written below.) */ - if (num_delays) - { - write_eligible_delay (attr_file, "delay"); - if (have_annul_true) - write_eligible_delay (attr_file, "annul_true"); - if (have_annul_false) - write_eligible_delay (attr_file, "annul_false"); - } + write_eligible_delay (attr_file, "delay"); + write_eligible_delay (attr_file, "annul_true"); + write_eligible_delay (attr_file, "annul_false"); /* Write out constant delay slot info. */ write_const_num_delay_slots (attr_file); -- cgit v1.2.1