This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH 3/4] always define HAVE_peephole2
- From: tbsaunde+gcc at tbsaunde dot org
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 20 Aug 2015 21:21:15 -0400
- Subject: [PATCH 3/4] always define HAVE_peephole2
- Authentication-results: sourceware.org; auth=none
- References: <1440120076-1815-1-git-send-email-tbsaunde+gcc at tbsaunde dot org>
From: tbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>
gcc/ChangeLog:
2015-08-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* genconfig.c (main): Always define HAVE_cc0.
* recog.c (rest_of_handle_peephole2): Adjust.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227051 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 5 +++++
gcc/genconfig.c | 5 +++++
gcc/recog.c | 8 +++-----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5debcca..2943501 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2015-08-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+ * genconfig.c (main): Always define HAVE_cc0.
+ * recog.c (rest_of_handle_peephole2): Adjust.
+
+2015-08-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
* reorg.c (relax_delay_slots): Don't use #if to check value of
HAVE_cc0.
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index acbf381..fc3c1eb 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -372,6 +372,11 @@ main (int argc, char **argv)
printf ("#define HAVE_peephole2 1\n");
printf ("#define MAX_INSNS_PER_PEEP2 %d\n", max_insns_per_peep2);
}
+ else
+ {
+ printf ("#define HAVE_peephole2 0\n");
+ printf ("#define MAX_INSNS_PER_PEEP2 0\n");
+ }
puts ("\n#endif /* GCC_INSN_CONFIG_H */");
diff --git a/gcc/recog.c b/gcc/recog.c
index c595bbd..352aec2 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -3018,7 +3018,6 @@ split_all_insns_noflow (void)
return 0;
}
-#ifdef HAVE_peephole2
struct peep2_insn_data
{
rtx_insn *insn;
@@ -3651,7 +3650,6 @@ peephole2_optimize (void)
if (peep2_do_cleanup_cfg)
cleanup_cfg (CLEANUP_CFG_CHANGED);
}
-#endif /* HAVE_peephole2 */
/* Common predicates for use with define_bypass. */
@@ -3804,9 +3802,9 @@ if_test_bypass_p (rtx_insn *out_insn, rtx_insn *in_insn)
static unsigned int
rest_of_handle_peephole2 (void)
{
-#ifdef HAVE_peephole2
- peephole2_optimize ();
-#endif
+ if (HAVE_peephole2)
+ peephole2_optimize ();
+
return 0;
}
--
2.4.0