diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/final.c | 4 | ||||
| -rw-r--r-- | gcc/genconfig.c | 2 | ||||
| -rw-r--r-- | gcc/genpeep.c | 2 | ||||
| -rw-r--r-- | gcc/output.h | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eea5da58d8b..89cccfbe894 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + * final.c (final_scan_insn): Don't check HAVE_peephole with the + preprocessor. + * output.h: Likewise. + * genconfig.c (main): Alwways define HAVE_peephole. + * genpeep.c: Don't emit checks of HAVE_peephole. + +2015-05-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + * combine.c, expmed.c, expr.c, optabs.c optabs.h, toplev.c: DOn't check HAVE_conditional_move with the preprocessor. diff --git a/gcc/final.c b/gcc/final.c index f0585ca8ecf..c8f059b17c0 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -2905,10 +2905,9 @@ final_scan_insn (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED, #endif -#ifdef HAVE_peephole /* Do machine-specific peephole optimizations if desired. */ - if (optimize_p && !flag_no_peephole && !nopeepholes) + if (HAVE_peephole && optimize_p && !flag_no_peephole && !nopeepholes) { rtx_insn *next = peephole (insn); /* When peepholing, if there were notes within the peephole, @@ -2937,7 +2936,6 @@ final_scan_insn (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED, /* PEEPHOLE might have changed this. */ body = PATTERN (insn); } -#endif /* Try to recognize the instruction. If successful, verify that the operands satisfy the diff --git a/gcc/genconfig.c b/gcc/genconfig.c index a3e5b3111ff..7237dedee56 100644 --- a/gcc/genconfig.c +++ b/gcc/genconfig.c @@ -369,6 +369,8 @@ main (int argc, char **argv) if (have_peephole_flag) printf ("#define HAVE_peephole 1\n"); + else + printf ("#define HAVE_peephole 0\n"); if (have_peephole2_flag) { diff --git a/gcc/genpeep.c b/gcc/genpeep.c index 3ba930c8a05..b914e85f863 100644 --- a/gcc/genpeep.c +++ b/gcc/genpeep.c @@ -389,7 +389,6 @@ from the machine description file `md'. */\n\n"); printf ("#include \"flags.h\"\n"); printf ("#include \"tm-constrs.h\"\n\n"); - printf ("#ifdef HAVE_peephole\n"); printf ("extern rtx peep_operand[];\n\n"); printf ("#define operands peep_operand\n\n"); @@ -423,7 +422,6 @@ from the machine description file `md'. */\n\n"); max_opno = 1; printf ("rtx peep_operand[%d];\n", max_opno + 1); - printf ("#endif\n"); fflush (stdout); return (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE); diff --git a/gcc/output.h b/gcc/output.h index 81d2ad29a83..4ce6eeaa2b4 100644 --- a/gcc/output.h +++ b/gcc/output.h @@ -289,9 +289,7 @@ extern void assemble_addr_to_section (rtx, section *); /* Return the size of the constant pool. */ extern int get_pool_size (void); -#ifdef HAVE_peephole extern rtx_insn *peephole (rtx_insn *); -#endif extern void output_shared_constant_pool (void); |