Merge FreeBSD modifications into gcc 3.2.1-prerelease:

  1.2  -fformat-extensions
  1.7  FORCE_OPTIMIZATION_DOWNGRADE knob for Alpha
  1.14 -O0 -O1 should optimize alignment for time, not size

Approved by:	obrien

1 files changed, 7 insertions, 3 deletions

diff --git a/contrib/gcc/toplev.c b/contrib/gcc/toplev.c
index c12d3cf6069c..22463973c25e 100644
--- a/contrib/gcc/toplev.c
+++ b/contrib/gcc/toplev.c
@@ -884,6 +884,10 @@ int align_labels_max_skip;
 int align_functions;
 int align_functions_log;
 
+/* Like align_functions_log above, but used by front-ends to force the
+   minimum function alignment.  Zero means no alignment is forced.  */
+int force_align_functions_log;
+
 /* Table of supported debugging formats.  */
 static const struct
 {
@@ -3023,13 +3027,13 @@ rest_of_compilation (decl)
 	 block.  The loop infrastructure does the real job for us.  */
       flow_loops_find (&loops, LOOP_TREE);
 
+      if (rtl_dump_file)
+	flow_loops_dump (&loops, rtl_dump_file, NULL, 0);
+
       /* Estimate using heuristics if no profiling info is available.  */
       if (flag_guess_branch_prob)
 	estimate_probability (&loops);
 
-      if (rtl_dump_file)
-	flow_loops_dump (&loops, rtl_dump_file, NULL, 0);
-
       flow_loops_free (&loops);
     }
   life_analysis (insns, rtl_dump_file, PROP_FINAL);