diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5547630..3ecdb77 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Thu Oct  8 04:26:20 1998  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
 
+	* flags.h (flag_branch_on_count_reg): Always declare 
+	* toplev.c (flag_branch_on_count_reg): Likewise.
+	* toplev.c: Fix typos.
+
 	* real.c (c4xtoe): Remove unused variables.  Add some missing parens.
 	(toc4x): Similarly.
 
diff --git a/gcc/flags.h b/gcc/flags.h
index 3b7dd5e..7c853d0 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -345,11 +345,11 @@ extern int flag_schedule_interblock;
 extern int flag_schedule_speculative;
 extern int flag_schedule_speculative_load;
 extern int flag_schedule_speculative_load_dangerous;
+#endif  /* HAIFA */
 
 /* flag_on_branch_count_reg means try to replace add-1,compare,branch tupple
    by a cheaper branch, on a count register. */
 extern int flag_branch_on_count_reg;
-#endif  /* HAIFA */
 
 
 /* Nonzero means put things in delayed-branch slots if supported. */
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7193cec..e2ddcaf 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -654,12 +654,11 @@ int flag_schedule_interblock = 1;
 int flag_schedule_speculative = 1;
 int flag_schedule_speculative_load = 0;
 int flag_schedule_speculative_load_dangerous = 0;
+#endif  /* HAIFA */
 
 /* flag_on_branch_count_reg means try to replace add-1,compare,branch tupple
    by a cheaper branch, on a count register. */
 int flag_branch_on_count_reg;
-#endif  /* HAIFA */
-
 
 /* -finhibit-size-directive inhibits output of .size for ELF.
    This is used only for compiling crtstuff.c, 
@@ -806,7 +805,7 @@ lang_independent_options f_options[] =
   {"unroll-loops", &flag_unroll_loops, 1,
    "Perform loop unrolling when interation count is known" },
   {"unroll-all-loops", &flag_unroll_all_loops, 1,
-   "Perofm loop onrolling for all loops" },
+   "Perform loop unrolling for all loops" },
   {"move-all-movables", &flag_move_all_movables, 1,
    "Force all loop invariant computations out of loops" },
   {"reduce-all-givs", &flag_reduce_all_givs, 1,
@@ -862,9 +861,9 @@ lang_independent_options f_options[] =
    "Allow speculative motion of some loads" },
   {"sched-spec-load-dangerous",&flag_schedule_speculative_load_dangerous, 1,
    "Allow speculative motion of more loads" },
+#endif  /* HAIFA */
   {"branch-count-reg",&flag_branch_on_count_reg, 1,
    "Replace add,compare,branch with branch on count reg"},
-#endif  /* HAIFA */
   {"pic", &flag_pic, 1,
    "Generate position independent code, if possible"},
   {"PIC", &flag_pic, 2, ""},