diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b376ab8d5c6..0e6e5d091c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-27  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* hash-set.h (DEFINE_DEBUG_HASH_SET): Remove static qualifier
+	from explicit instantiation of debug_helper.
+	* vec.h (DEFINE_DEBUG_VEC): Ditto.
+
 2017-11-27  Richard Biener  <rguenther@suse.de>
 
 	* gimple-fold.c (gimple_fold_builtin_memory_op): Remove dead code,
diff --git a/gcc/hash-set.h b/gcc/hash-set.h
index 75ca1475e0d..8b83f6ae99b 100644
--- a/gcc/hash-set.h
+++ b/gcc/hash-set.h
@@ -150,7 +150,7 @@ debug_helper (hash_set<T> &ref)
 }
 
 #define DEFINE_DEBUG_HASH_SET(T) \
-  template static void debug_helper (hash_set<T> &);	\
+  template void debug_helper (hash_set<T> &);		\
   DEBUG_FUNCTION void					\
   debug (hash_set<T> &ref)				\
   {							\
diff --git a/gcc/vec.h b/gcc/vec.h
index b145eef2bc7..f55a41f53dd 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -453,8 +453,8 @@ debug_helper (vec<T, va_gc> &ref)
    functions for a type T.  */
 
 #define DEFINE_DEBUG_VEC(T) \
-  template static void debug_helper (vec<T> &);		\
-  template static void debug_helper (vec<T, va_gc> &);	\
+  template void debug_helper (vec<T> &);		\
+  template void debug_helper (vec<T, va_gc> &);		\
   /* Define the vec<T> debug functions.  */		\
   DEBUG_FUNCTION void					\
   debug (vec<T> &ref)					\