always define HAVE_peephole

gcc/ChangeLog:

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.

From-SVN: r223519

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eea5da58d8bfba441294e58eb35fda6cdc5be099..89cccfbe894ce196a66daacbaf0bc0c25cbf5d5a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/gcc/final.c b/gcc/final.c
index f0585ca8ecf1239f4ef0c909545c1835992641ca..c8f059b17c0a118d930e5b4dbf85ae11c30e6352 100644 (file)
--- 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 a3e5b3111ff7b43d5eed025bc4cfb6420974e56c..7237dedee5666b71262db21497f42cf4adcdc0fe 100644 (file)
--- 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 3ba930c8a0547b3f497e216c65947d991f3e9031..b914e85f863af46c4059408495dcf4c6385118a5 100644 (file)
--- 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 81d2ad29a83f894de72c87f417bafa367b45a546..4ce6eeaa2b476bf2513bb13074f1365d1c471400 100644 (file)
--- 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);