diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b49b2ae1c3..6ca200ca03c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-08-30  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* cfg.h (class auto_edge_flag): Spell out the template-id of the
+	base class in the initializer list.  This is a workaround for
+	building with older GCC.
+	(class auto_bb_flag): Likewise.
+
 2018-08-30  Aaron Sawdey  <acsawdey@linux.ibm.com>
 
 	* config/rs6000/altivec.md (altivec_eq<mode>): Remove star.
diff --git a/gcc/cfg.h b/gcc/cfg.h
index 9fff135d11f..3d660bde4c9 100644
--- a/gcc/cfg.h
+++ b/gcc/cfg.h
@@ -169,7 +169,7 @@ class auto_edge_flag : public auto_flag<int>
 {
 public:
   auto_edge_flag (function *fun)
-    : auto_flag (&fun->cfg->edge_flags_allocated) {}
+    : auto_flag<int> (&fun->cfg->edge_flags_allocated) {}
 };
 
 /* RAII class to allocate a bb flag for temporary use.  You have
@@ -178,7 +178,7 @@ class auto_bb_flag : public auto_flag<int>
 {
 public:
   auto_bb_flag (function *fun)
-    : auto_flag (&fun->cfg->bb_flags_allocated) {}
+    : auto_flag<int> (&fun->cfg->bb_flags_allocated) {}
 };
 
 #endif /* GCC_CFG_H */