From: Trevor Saunders <tbsaunde+...@tbsaunde.org>

gcc/ChangeLog:

2015-04-21  Trevor Saunders  <tbsaunde+...@tbsaunde.org>

        * defaults.h (INSN_REFERENCES_ARE_DELAYED): New definition.
        * reorg.c (redundant_insn): Remove ifdef
        INSN_REFERENCES_ARE_DELAYED.
        * resource.c (mark_referenced_resources): Likewise.
---
 gcc/defaults.h | 4 ++++
 gcc/reorg.c    | 4 ----
 gcc/resource.c | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gcc/defaults.h b/gcc/defaults.h
index 79cb599..cafcb1e 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1205,6 +1205,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. 
 If not, see
 #define INSN_SETS_ARE_DELAYED(INSN) false
 #endif
 
+#ifndef INSN_REFERENCES_ARE_DELAYED
+#define INSN_REFERENCES_ARE_DELAYED(INSN) false
+#endif
+
 #ifdef GCC_INSN_FLAGS_H
 /* Dependent default target macro definitions
 
diff --git a/gcc/reorg.c b/gcc/reorg.c
index ae77f0a..d8d8ab69 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -1558,10 +1558,8 @@ redundant_insn (rtx insn, rtx_insn *target, rtx 
delay_list)
          if (INSN_SETS_ARE_DELAYED (seq->insn (0)))
            return 0;
 
-#ifdef INSN_REFERENCES_ARE_DELAYED
          if (INSN_REFERENCES_ARE_DELAYED (seq->insn (0)))
            return 0;
-#endif
 
          /* See if any of the insns in the delay slot match, updating
             resource requirements as we go.  */
@@ -1658,10 +1656,8 @@ redundant_insn (rtx insn, rtx_insn *target, rtx 
delay_list)
          if (INSN_SETS_ARE_DELAYED (control))
            return 0;
 
-#ifdef INSN_REFERENCES_ARE_DELAYED
          if (INSN_REFERENCES_ARE_DELAYED (control))
            return 0;
-#endif
 
          if (JUMP_P (control))
            annul_p = INSN_ANNULLED_BRANCH_P (control);
diff --git a/gcc/resource.c b/gcc/resource.c
index 5af9376..26d9fca 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -392,11 +392,9 @@ mark_referenced_resources (rtx x, struct resources *res,
                          include_delayed_effects
                          ? MARK_SRC_DEST_CALL : MARK_SRC_DEST);
 
-#ifdef INSN_REFERENCES_ARE_DELAYED
       if (! include_delayed_effects
          && INSN_REFERENCES_ARE_DELAYED (as_a <rtx_insn *> (x)))
        return;
-#endif
 
       /* No special processing, just speed up.  */
       mark_referenced_resources (PATTERN (x), res, include_delayed_effects);
-- 
2.3.0.80.g18d0fec.dirty

Reply via email to