diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 090d4f9e158fc1be739aee755ee412a9c6e59a7c..3d78f33d71a675cda4a2e7fbcde675aee87bb1f3 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libatomic/configure b/libatomic/configure
index 67a2c9269a34aab8e2e4dde31f5fc310f4deaef3..b902e2c960683bc4507784d96ecd970c5d39eeca 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -15373,7 +15373,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 097993bedf361b5db245550499c8610cb6c1ddfa..c01c7d826a9e59cb3e9c0ee5c6e0d6c04da8e61e 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libbacktrace/configure b/libbacktrace/configure
index b1e3adedda0442dbc15774c2079f24b78c266095..87cadda6c8c68968ed2b834390bc478443c9211a 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -11861,7 +11861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index f0361dc73fc616c9379aa25fc353cd41b43aec49..86003ea2a22715be5d52698e70a89d9fecd22b70 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-20  Michael Meissner  <meissner@linux.ibm.com>
 
 	PR target/85456
diff --git a/libgcc/configure b/libgcc/configure
index fa0241346686adb9f4c9662cc4648e9d2787fa82..b2f3f8708441e473b8e2941c4748748b6c7c40b8 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4849,7 +4849,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index ea4358cc54e825cdba8d5841765e1615fac7447a..355f568a06251f0304d7acf5769c466d8facb684 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Thomas Schwinge  <thomas@codesourcery.com>
 
 	PR libfortran/85166
diff --git a/libgfortran/configure b/libgfortran/configure
index d3e323c11a7deadd68d605aaccb499d12b9be546..91fce8fecd080e7fa969c76c875482c9446331a4 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -5863,7 +5863,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1c9fa4405646fd18a1bbfea5091c195aa1b6afab..51a8aebfdae44c5ddff2bfc90d66b2d859d00cbd 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-20  Nathan Sidwell  <nathan@codesourcery.com>
 	    Tom de Vries  <tom@codesourcery.com>
 
diff --git a/libgomp/configure b/libgomp/configure
index 5d8412c5f195101da3f7537d13dbdd554d112754..ced7606b35575d7ec0be8c48fe6baf661a1b8d8a 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16692,7 +16692,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 7f6a24f1a604867eeb63a8060b2a0f6134715e50..de57e708c4c16ed41c4f6b4ca539bcf281711108 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/85489
diff --git a/libitm/configure b/libitm/configure
index 10db435d01c376f454b31305e05edcb0966fef51..dbf386db4348f822873d08d67d1b080e2e6c7a56 100644
--- a/libitm/configure
+++ b/libitm/configure
@@ -17662,7 +17662,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog
index 3f6540496eec36a1d7377e27fd83b4728f0c7b06..4eab590b86c4e3b12ed73ca08c0074daf5061078 100644
--- a/libmpx/ChangeLog
+++ b/libmpx/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libmpx/configure b/libmpx/configure
index 5a4d7f49e0e0a12150d5db006cb8a15cffc74238..708565964259fa38da2a2bc0e4b41f31ed42bc1d 100644
--- a/libmpx/configure
+++ b/libmpx/configure
@@ -11657,7 +11657,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 42ded9f3a5ef3cd0109181d75d80d750dc105559..140c56d86df3ced0cf36655521096e52045549e0 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libobjc/configure b/libobjc/configure
index 699f3773a218ddde622339fb574b2288019b8754..d1a032fbf6a82e0980fa1242f7889ff3f031d24f 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -3428,7 +3428,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index cb3fdd011011662989061eeb82e3535c686dde83..46abcf2f2f71bc842c3e1ff2a0870254b8c78538 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libquadmath/configure b/libquadmath/configure
index 4ad6e3d682bb98bdee51a86b6b66a1935d012e2e..14610d66238e6c433dec5d27879cc0b1b6216e7a 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -12896,7 +12896,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 1729b5b474bfb26f698f57ee67ff34e78cf01d61..df4954f72b0e35b4febb9297b5ec7b404e247a24 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 5fdc5126478b4438b86e35a89dfd5eef7b0a0147..4695bc7d4f7dfdbdf672d6e31cdd934a3fd4bdac 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -16598,7 +16598,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index e4316e16040c93b81cb8cbc5acb0b107d10b0070..ef673a03f54c7d6dc20b3b71c361d8cb764a2ead 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libssp/configure b/libssp/configure
index f60b7d704020d7bd1a66dd856a35c210fba880dc..4e88e4916ccb9e750a506c158329c6e4f6de4f75 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -4154,7 +4154,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2280f1711aa5dbfa767635c089feded93cfa96bf..acdc6ffd124da472e36e471e8c3487a0d004b7a7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 49d12887d522578b94d613ad7a8053161c11cbe4..ba094be6f15ba38a4959c74f9102a514123e571f 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -81214,7 +81214,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index e8c90aa73de94d81ea3949cfdf02087029531a2a..1f163c244d08375a5f9ea0b65e1ac7b0c040cda8 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2018-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure: Regenerated.
diff --git a/libvtv/configure b/libvtv/configure
index cde00f9bd6c0ae5fa8ec7e23afa84efdcf5ffcd3..a197f7504537a8569178cb73e802dec62e7f3da2 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -15532,7 +15532,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
 esac
 if test x$enable_cet = xyes; then
-  CET_FLAGS="-fcf-protection -mcet"
+  CET_FLAGS="-fcf-protection -mshstk"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else