More Cilk Plus removal

	contrib/
	* update-copyright.py: Remove "libcilkrts" reference.
	gcc/c-family/
	* c-attribs.c (c_common_attribute_table): Remove "cilk simd
	function".
	gcc/
	* doc/invoke.texi: Remove "Cilk Plus" references.

From-SVN: r258141

6 files changed, 16 insertions, 6 deletions

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 627cafd..6bb3b6f 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* update-copyright.py: Remove "libcilkrts" reference.
+
 2018-02-19  Yury Gribov  <tetra2005@gmail.com>
 
 	* compare_tests: Use TMPDIR when set.
diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index 85be1e1..9295c6b 100755
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 2013-2018 Free Software Foundation, Inc.
 #
 # This script is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -708,7 +708,6 @@ class GCCCmdLine (CmdLine):
         self.add_dir ('libatomic')
         self.add_dir ('libbacktrace')
         self.add_dir ('libcc1')
-        # libcilkrts is imported from upstream.
         self.add_dir ('libcpp', LibCppFilter())
         self.add_dir ('libdecnumber')
         # libffi is imported from upstream.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 447d563..662b72f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* doc/invoke.texi: Remove "Cilk Plus" references.
+
 2018-03-02  Jakub Jelinek  <jakub@redhat.com>
 	    Richard Biener  <rguenther@suse.de>
 
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index c10b7bf..27cc43e 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* c-attribs.c (c_common_attribute_table): Remove "cilk simd
+	function".
+
 2018-03-01  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/84639
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index 3ebb2d6..cebc0b2 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -439,8 +439,6 @@ const struct attribute_spec c_common_attribute_table[] =
 			      handle_returns_nonnull_attribute, NULL },
   { "omp declare simd",       0, -1, true,  false, false, false,
 			      handle_omp_declare_simd_attribute, NULL },
-  { "cilk simd function",     0, -1, true,  false, false, false,
-			      handle_omp_declare_simd_attribute, NULL },
   { "simd",		      0, 1, true,  false, false, false,
 			      handle_simd_attribute, NULL },
   { "omp declare target",     0, 0, true, false, false, false,
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 8d366c6..ad0fec6 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -6710,7 +6710,7 @@ Requires @option{-flto-odr-type-merging} to be enabled.  Enabled by default.
 
 @item -Wopenmp-simd
 @opindex Wopenm-simd
-Warn if the vectorizer cost model overrides the OpenMP or the Cilk Plus
+Warn if the vectorizer cost model overrides the OpenMP
 simd directive set by user.  The @option{-fsimd-cost-model=unlimited}
 option can be used to relax the cost model.
 
@@ -8953,7 +8953,7 @@ either @samp{dynamic} or @samp{cheap}.
 @item -fsimd-cost-model=@var{model}
 @opindex fsimd-cost-model
 Alter the cost model used for vectorization of loops marked with the OpenMP
-or Cilk Plus simd directive.  The @var{model} argument should be one of
+simd directive.  The @var{model} argument should be one of
 @samp{unlimited}, @samp{dynamic}, @samp{cheap}.  All values of @var{model}
 have the same meaning as described in @option{-fvect-cost-model} and by
 default a cost model defined with @option{-fvect-cost-model} is used.