diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index f6f5e7c5c25c9e9fbb1b956adc46cf246567e298..46fb924e501ca460347ab4bfbd0e622091252ad1 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-20  Marek Polacek  <polacek@redhat.com>
+
+	* array-notation-common.c (is_cilkplus_vector_p): Define.
+	* c-common.h (is_cilkplus_vector_p): Declare.
+
 2015-10-20  Marek Polacek  <polacek@redhat.com>
 
 	* c.opt (std=gnu++11): Do not describe as experimental.
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index 85ded8d6b7cadab42e3e4bb98d316ec7dc651d5c..6b55747b7d688d3dac902e16b540a525c8907ca2 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -676,3 +676,12 @@ fix_sec_implicit_args (location_t loc, vec <tree, va_gc> *list,
       vec_safe_push (array_operand, (*list)[ii]);
   return array_operand;
 }
+
+/* Returns true if NAME is an IDENTIFIER_NODE with identifier "vector",
+   "__vector", or "__vector__".  */
+
+bool
+is_cilkplus_vector_p (tree name)
+{
+  return flag_cilkplus && is_attribute_p ("vector", name);
+}
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index cf4448230d9fc875720e2921b5c960f434749890..4b5cac85446db1b49d98c6bc5ac4f9771c38a091 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1435,6 +1435,7 @@ extern void cilkplus_extract_an_triplets (vec<tree, va_gc> *, size_t, size_t,
 					  vec<vec<an_parts> > *);
 extern vec <tree, va_gc> *fix_sec_implicit_args
   (location_t, vec <tree, va_gc> *, vec<an_loop_parts>, size_t, tree);
+extern bool is_cilkplus_vector_p (tree);
 
 /* In cilk.c.  */
 extern tree insert_cilk_frame (tree);
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 2a083c40d80b04a3ff18836e2471190b17cf3213..c1dbde6f2d90699a7160b62be7cd861b6addd765 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-20  Marek Polacek  <polacek@redhat.com>
+
+	* c-parser.c (is_cilkplus_vector_p): Don't define here.
+
 2015-10-20  Marek Polacek  <polacek@redhat.com>
 
 	PR c/67964
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index e7b84400b5adca0fcf1c2ec4957cab449f103f04..c8c6a2dff909a8b1320b47b9e797a57838b942a9 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -3848,17 +3848,6 @@ c_parser_attribute_any_word (c_parser *parser)
   return attr_name;
 }
 
-/* Returns true of NAME is an IDENTIFIER_NODE with identiifer "vector,"
-   "__vector" or "__vector__."  */
-
-static inline bool
-is_cilkplus_vector_p (tree name)
-{ 
-  if (flag_cilkplus && is_attribute_p ("vector", name)) 
-    return true;
-  return false;
-}
-
 #define CILK_SIMD_FN_CLAUSE_MASK				  \
 	((OMP_CLAUSE_MASK_1 << PRAGMA_CILK_CLAUSE_VECTORLENGTH)	  \
 	 | (OMP_CLAUSE_MASK_1 << PRAGMA_CILK_CLAUSE_LINEAR)	  \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6ffa733c0ac053c99584e4930ec19f646053eb7e..63bb46f7e74418f9ceb5303ccab76a9ef260fe9e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-20  Marek Polacek  <polacek@redhat.com>
+
+	* parser.c (is_cilkplus_vector_p): Don't define here.
+
 2015-10-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/67064
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f07a5e49532d62a000e53ba63fbd3024600b792a..cfe5468a8b5039c458cab9cc49e2c23dac1afb7c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23225,17 +23225,6 @@ cp_parser_gnu_attributes_opt (cp_parser* parser)
   return attributes;
 }
 
-/* Returns true of NAME is an IDENTIFIER_NODE with identiifer "vector,"
-   "__vector" or "__vector__."  */
-
-static inline bool
-is_cilkplus_vector_p (tree name)
-{ 
-  if (flag_cilkplus && is_attribute_p ("vector", name)) 
-    return true;
-  return false;
-}
-
 /* Parse a GNU attribute-list.
 
    attribute-list: