diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65f73d0e91d..b421705d973 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/mn10300/mn10300.h (CONDITIONAL_REGISTER_USAGE): Declare
+	variable I locally, instead of expecting a declaration in the
+	calling context.
+
 2001-08-03  Richard Henderson  <rth@redhat.com>
 
 	* except.c (collect_one_action_chain): Add an explicit cleanup
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index 7835c0f0893..63fef6009f9 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -189,6 +189,8 @@ extern int target_flags;
 
 #define CONDITIONAL_REGISTER_USAGE \
 {						\
+  unsigned int i;				\
+						\
   if (!TARGET_AM33)				\
     {						\
       for (i = FIRST_EXTENDED_REGNUM; 		\