diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 54aec7f7d9..8344f6e582 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-07  Adam Stylinski  <adam.stylinski@etegent.com>
+
+	PR c++/21222
+	* target-descriptions.c (print_c_tdesc::visit_pre): Change type of
+	range-for variable.
+
 2017-12-07  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* common/selftest.h (struct selftest): Add virtual destructor.
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 5a6f61945d..88ac55f404 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -1833,7 +1833,7 @@ public:
 	printf_unfiltered ("\n");
       }
 
-    for (const struct bfd_arch_info *compatible : e->compatible)
+    for (const bfd_arch_info_type *compatible : e->compatible)
       printf_unfiltered
 	("  tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
 	 compatible->printable_name);