backport: re PR rtl-optimization/42775 (GCC fails to rebuild itself with STAGE1_CFLAG...

	Backport from mainline:
	2010-09-20  Eric Botcazou  <ebotcazou@adacore.com>

	PR rtl-optimization/42775
	* cfgrtl.c (rest_of_pass_free_cfg): Recompute notes if delay slot
	scheduling is enabled.

From-SVN: r174133

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea6fc584f918eb1f2e0819e90d91418ec97122d1..0b9d0a08023c935f664ff84619d500c5c6ad58af 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-24  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
+       Backport from mainline:
+       2010-09-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR rtl-optimization/42775
+       * cfgrtl.c (rest_of_pass_free_cfg): Recompute notes if delay slot
+       scheduling is enabled.
+
        PR rtl-optimization/49007
        Backport from mainline:
        2009-11-30  Hans-Peter Nilsson  <hp@axis.com>

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index b46d72d8dd79fa2ee6bda57f06e3cccb7398f39e..ad2f8ebb0cd28f6f6698244d8a9038eaba01a9ba 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -435,7 +435,10 @@ rest_of_pass_free_cfg (void)
   /* The resource.c machinery uses DF but the CFG isn't guaranteed to be
      valid at that point so it would be too late to call df_analyze.  */
   if (optimize > 0 && flag_delayed_branch)
-    df_analyze ();
+    {
+      df_note_add_problem ();
+      df_analyze ();
+    }
 #endif
 
   free_bb_for_insn ();