diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0498a0c359..e80e8c7350 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-08  Nick Clifton  <nickc@redhat.com>
+
+	* testsuite/gentestdlls.c (main): Move declaration of loop
+	variable outside of the for() statement.
+
 2019-08-08  Jordan Rupprecht  <rupprecht@google.com>
 
 	* readelf.c (process_note): Mask unknown description data bytes.
diff --git a/binutils/testsuite/gentestdlls.c b/binutils/testsuite/gentestdlls.c
index 09bbe3319f..22d6bac876 100644
--- a/binutils/testsuite/gentestdlls.c
+++ b/binutils/testsuite/gentestdlls.c
@@ -129,6 +129,7 @@ main (int argc, char** argv)
 {
   char* program_name = argv[0];
   char* output_directory = argv[1];
+  int i;
 
   if (argc < 3)
     {
@@ -150,7 +151,7 @@ main (int argc, char** argv)
      platforms.  See https://github.com/jbevain/cecil/issues/337 for an
      example of this value being used in practice.  */
 
-  for (int i = 2; i < argc; i++)
+  for (i = 2; i < argc; i++)
     {
       char* wanted_format = argv[i];