diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2343f8d08d4..764249cd3ef 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-29  Tom de Vries  <tom@codesourcery.com>
+
+	* final.c (collect_fn_hard_reg_usage): Guard variable declaration
+	with #ifdef STACK_REGS.
+
 2014-05-28  Jan Hubicka  <hubicka@ucw.cz>
 
 	* varasm.c (get_variable_section): Walk aliases.
diff --git a/gcc/final.c b/gcc/final.c
index a345fe7059b..c32e177a426 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -4750,7 +4750,9 @@ static void
 collect_fn_hard_reg_usage (void)
 {
   rtx insn;
+#ifdef STACK_REGS
   int i;
+#endif
   struct cgraph_rtl_info *node;
 
   /* ??? To be removed when all the ports have been fixed.  */