x86: Also check if -fcf-protection works

When defaulting CET run-time support to auto, check if -fcf-protection
works.  Even if the stage1 GCC doesn't support -fcf-protection, since
the final GCC does, CET run-time support will be enabled by default if
binutils support CET.

config/

	PR bootstrap/95147
	* cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works
	when defaulting to auto.

libatomic/

	PR bootstrap/95147
	* configure: Regenerated.

libbacktrace/

	PR bootstrap/95147
	* configure: Regenerated.

libgcc/

	PR bootstrap/95147
	* configure: Regenerated.

libgfortran/

	PR bootstrap/95147
	* configure: Regenerated.

libgomp/

	PR bootstrap/95147
	* configure: Regenerated.

libitm/

	PR bootstrap/95147
	* configure: Regenerated.

libobjc/

	PR bootstrap/95147
	* configure: Regenerated.

libphobos/

	PR bootstrap/95147
	* configure: Regenerated.

libquadmath/

	PR bootstrap/95147
	* configure: Regenerated.

libsanitizer/

	PR bootstrap/95147
	* configure: Regenerated.

libssp/

	PR bootstrap/95147
	* configure: Regenerated.

libstdc++-v3/

	PR bootstrap/95147
	* configure: Regenerated.

libvtv/

	PR bootstrap/95147
	* configure: Regenerated.

zlib/

	PR bootstrap/95147
	* configure: Regenerated.

diff --git a/config/ChangeLog b/config/ChangeLog
index d36c5bb497623ecdf488af172fded068a80258d5..a4d54749669bcc065b9ab315e51ffdb2c2bc981e 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works
+       when defaulting to auto.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * cet.m4 (GCC_CET_FLAGS): Change default to auto.

diff --git a/config/cet.m4 b/config/cet.m4
index 63c6ea9ee02d3a35295c618d2db87cff01d13656..2bb2c8a95ac1b59f83ef6376f7de7b90b077e342 100644 (file)
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -13,6 +13,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM(
          [],
@@ -25,6 +27,7 @@ asm ("setssbsy");
          ])],
         [enable_cet=yes],
         [enable_cet=no])
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 38d5ef3dabbef13f2b06d1bdb0bc47ceaf253778..ddfce8d5552e0de63feef6944c6d6bacbe65965c 100644 (file)
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libatomic/configure b/libatomic/configure
index c4b4714abc00defb11542cbdc82e65bfa8e46e0f..478670a6fe702c2df53a3c63744049fa900106e0 100755 (executable)
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -15595,6 +15595,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15618,6 +15620,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 81fa56e5ba5b5de6061c1edde7101fdea601484a..9f45d72f4fe35bcde77d548444080816abfe9065 100644 (file)
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libbacktrace/configure b/libbacktrace/configure
index 95d06c60be11b23c989140ace8a0424dcc7c2f16..d851e807d2d60a01fdf079ff5f6f5bfff5535376 100755 (executable)
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -12169,6 +12169,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12192,6 +12194,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index b0a432f32363a2d2c8fa3e1473d0fcf3a9b46c1a..7343c773ecf2301ec113fd50aba115262bc07abc 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libgcc/configure b/libgcc/configure
index a5d5ab84607ab64b6fd5ae1dba5b15a4ab5f4d6b..5d0c79bcd75c47879ac1ede1f13d3fe7ae5d542f 100755 (executable)
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4913,6 +4913,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4936,6 +4938,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1e6ee7929fdad35d482787329342f7d51c87e17b..149f45e1088fcd11dad3e5c5ef303634b29b6a28 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR libfortran/95119

diff --git a/libgfortran/configure b/libgfortran/configure
index 3c8be061ede44a12ba6be80ad62e9f90be5f4f6f..97d9616e425603f056ec6033cc1769e2f6e47f17 100755 (executable)
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -6014,6 +6014,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6037,6 +6039,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.
@@ -12719,7 +12722,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12722 "configure"
+#line 12725 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12825,7 +12828,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12828 "configure"
+#line 12831 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 687b7207a893bfe7fb7a517d1a3f5b29bcc42e6b..0011763acd8d3b45ecfdcd91b591ece7f1dec294 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR libfortran/95119

diff --git a/libgomp/configure b/libgomp/configure
index 4a0e1498415f44407f6e265bf3db12f79fe0bbc9..e5710b26749176313b98d26c0585a8822af4ae60 100755 (executable)
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16753,6 +16753,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16776,6 +16778,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 3c384113d0797c1c42f2a7f4e641491fbccf04ef..b3ebcab466b1a1954140119b6314bc110be81b9b 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libitm/configure b/libitm/configure
index 2c451fb0a981ebabb31602ae8dc522cefc775c4e..be70ea6f76f03c7ebbbd4965a631d0c1fc889e7e 100755 (executable)
--- a/libitm/configure
+++ b/libitm/configure
@@ -17890,6 +17890,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17913,6 +17915,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index accabfbd37926236ed3e3b86f490a5b514058dc7..5f42020f0b625557616d39c5eb6bc4e4445c5259 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libobjc/configure b/libobjc/configure
index 018c9db76e8128d838b28e4a1cfcac358c24b317..6975a727d5e75d2797d298c9ce3dd3e44695c233 100755 (executable)
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -3466,6 +3466,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3489,6 +3491,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.
@@ -10775,7 +10778,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10778 "configure"
+#line 10781 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10881,7 +10884,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10884 "configure"
+#line 10887 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index c885d9262167aed6828f940ac4704fb0ba2f7053..e5422ecd06366ab89df1dd1736e5a2bc9d0fb583 100644 (file)
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-08  H.J. Lu  <hongjiu.lu@intel.com>
 
        * libdruntime/config/x86/switchcontext.S: Include <cet.h> if

diff --git a/libphobos/configure b/libphobos/configure
index c8137d4d572bd6e25daa23b1e3c1fc50a48923a2..4551e9fddefc4b2445c8552da2b7880fc68a9a79 100755 (executable)
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -1478,7 +1478,7 @@ Optional Features:
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
-  --enable-cet            enable Intel CET in target libraries [default=no]
+  --enable-cet            enable Intel CET in target libraries [default=auto]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -5573,7 +5573,7 @@ if test "${enable_cet+set}" = set; then :
                           esac
 
 else
-  enable_cet=no
+  enable_cet=auto
 fi
 
 
@@ -5586,6 +5586,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5609,6 +5611,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.
@@ -11734,7 +11737,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11737 "configure"
+#line 11740 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11840,7 +11843,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11843 "configure"
+#line 11846 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index fbb548e8b048dba2f168b351f666d50c17b9584c..eb045415f7542f05da3b2d697abb912b7d87ff96 100644 (file)
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libquadmath/configure b/libquadmath/configure
index d995a2cfd25f89f0f415175ca8fafb10827bbbf7..dee79cf99a02f95db92725053a53ad69ff90f150 100755 (executable)
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -13039,6 +13039,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13062,6 +13064,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 7bb6269e65062a54056884fa1081bd2846ad6440..001483b6ca6d8ab969113d4d297a64291f3b688d 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libsanitizer/configure b/libsanitizer/configure
index 8d1aa6db492c9248fd0ec8c77779cce520732af5..7ec074491c1a28b9818ce48f2a18a946f8b90d9f 100755 (executable)
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -16862,6 +16862,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16885,6 +16887,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index 43fe3fe35fedffd43a52262b0fb71a195622d125..dfb2015edc52d563e5d8a4de25a800c1ffa41d1b 100644 (file)
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libssp/configure b/libssp/configure
index 7e54b16bfafe974b3eb34555038e6861e07c384f..2eb4c7998d5f0810bb91d38a713bbbda1e245b25 100755 (executable)
--- a/libssp/configure
+++ b/libssp/configure
@@ -4338,6 +4338,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4361,6 +4363,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.
@@ -10996,7 +10999,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10999 "configure"
+#line 11002 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11102,7 +11105,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11105 "configure"
+#line 11108 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a6f5d6f09de1b5c3bdea6fc4cbcd973336ad7112..dde62ad477970b474503d0e1a7d894ed3dcf2f8d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 24cc51c8befc7a8de467c628af2377ba2a8ca8b3..502f660200121b9b8be2a059d4db2f5dca9a2734 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -77488,6 +77488,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -77511,6 +77513,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 96c417c4042c59b13b8d3fd1426bd3aee3e24c55..b50e74be2c7209ada12dd98c636f6a1a1d3e7165 100644 (file)
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libvtv/configure b/libvtv/configure
index 9d42cb88fb2035db2f871dc201148ea0ecf2975a..eced2b23ce09cb025337ae478c08f47a8e599f10 100755 (executable)
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -15680,6 +15680,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15703,6 +15705,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 1057533823bc02c2a41c6b282d24ca6fe5656560..0986b1469f0f3913022daad273a4812ccdbdc2f7 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR bootstrap/95147
+       * configure: Regenerated.
+
 2020-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/zlib/configure b/zlib/configure
index 65005f131dc9b1d238e2ff5c0d9cefbfa35f40fc..ae1f193491175d222c9c5c975bdbecb0a50d2184 100755 (executable)
--- a/zlib/configure
+++ b/zlib/configure
@@ -4169,6 +4169,8 @@ case "$host" in
       auto)
        # Check if target supports multi-byte NOPs
        # and if assembler supports CET insn.
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fcf-protection"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4192,6 +4194,7 @@ else
   enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       CFLAGS="$save_CFLAGS"
        ;;
       yes)
        # Check if assembler supports CET.
@@ -10739,7 +10742,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10742 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10845,7 +10848,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10848 "configure"
+#line 10851 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H