Avoid nested save_CFLAGS and save_LDFLAGS

Avoid nested save_CFLAGS and save_LDFLAGS by replacing save_CFLAGS and save_LDFLAGS with cet_save_CFLAGS and cet_save_LDFLAGS in cet.m4. config/ PR bootstrap/95413 * cet.m4: Replace save_CFLAGS and save_LDFLAGS with cet_save_CFLAGS and cet_save_LDFLAGS. gcc/ PR bootstrap/95413 * configure: Regenerated. libatomic/ PR bootstrap/95413 * configure: Regenerated. libbacktrace/ PR bootstrap/95413 * configure: Regenerated. libcc1/ PR bootstrap/95413 * configure: Regenerated. libcpp/ PR bootstrap/95413 * configure: Regenerated. libdecnumber/ PR bootstrap/95413 * configure: Regenerated. libgcc/ PR bootstrap/95413 * configure: Regenerated. libgfortran/ PR bootstrap/95413 * configure: Regenerated. libgomp/ PR bootstrap/95413 * configure: Regenerated. libiberty/ PR bootstrap/95413 * configure: Regenerated. libitm/ PR bootstrap/95413 * configure: Regenerated. libobjc/ PR bootstrap/95413 * configure: Regenerated. libphobos/ PR bootstrap/95413 * configure: Regenerated. libquadmath/ PR bootstrap/95413 * configure: Regenerated. libsanitizer/ PR bootstrap/95413 * configure: Regenerated. libssp/ PR bootstrap/95413 * configure: Regenerated. libstdc++-v3/ PR bootstrap/95413 * configure: Regenerated. libvtv/ PR bootstrap/95413 * configure: Regenerated. lto-plugin/ PR bootstrap/95413 * configure: Regenerated. zlib/ PR bootstrap/95413 * configure: Regenerated.
2026-05-06 14:59:39 +02:00 · 2020-05-29 12:23:33 -07:00
parent 7deca8c0b3
commit 9051b54827
21 changed files with 102 additions and 88 deletions
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -7,13 +7,14 @@ GCC_ENABLE(cet, auto, ,[enable Intel CET in target libraries],
 	   permit yes|no|auto)
 AC_MSG_CHECKING([for CET support])

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[[34567]]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	AC_COMPILE_IFELSE(
 	 [AC_LANG_PROGRAM(
@@ -27,7 +28,7 @@ asm ("setssbsy");
 	  ])],
 	 [enable_cet=yes],
 	 [enable_cet=no])
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -64,7 +65,7 @@ AC_MSG_CHECKING([for CET support])
 case "$host" in
  i[[34567]]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -93,7 +94,7 @@ asm ("setssbsy");
 	 [AC_MSG_ERROR([assembler with CET support is required for --enable-cet])])
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -101,9 +102,9 @@ asm ("setssbsy");
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -159,6 +160,6 @@ if test x$enable_cet = xyes; then
 else
  AC_MSG_RESULT([no])
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"
 ])
--- a/gcc/configure
+++ b/gcc/configure
@@ -31747,7 +31747,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -31798,7 +31798,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -31806,9 +31806,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -31896,8 +31896,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"

 case x$enable_languages in
 *jit*)
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -15589,13 +15589,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15620,7 +15621,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -12163,13 +12163,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12194,7 +12195,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -12403,7 +12404,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -12454,7 +12455,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -12462,9 +12463,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -12552,8 +12553,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"

 case x$enable_languages in
 *jit*)
--- a/libcc1/configure
+++ b/libcc1/configure
@@ -14560,7 +14560,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -14611,7 +14611,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -14619,9 +14619,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -14709,8 +14709,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"



--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7559,7 +7559,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -7610,7 +7610,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -7618,9 +7618,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -7708,8 +7708,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"

 case x$enable_languages in
 *jit*)
--- a/libdecnumber/configure
+++ b/libdecnumber/configure
@@ -5212,7 +5212,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -5263,7 +5263,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -5271,9 +5271,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -5361,8 +5361,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"

 case x$enable_languages in
 *jit*)
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4907,13 +4907,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4938,7 +4939,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -6008,13 +6008,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6039,7 +6040,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -12722,7 +12723,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 12725 "configure"
+#line 12726 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -12828,7 +12829,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 12831 "configure"
+#line 12832 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16753,7 +16753,7 @@ case "$host" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16778,7 +16778,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5286,7 +5286,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -5337,7 +5337,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -5345,9 +5345,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -5438,8 +5438,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"



--- a/libitm/configure
+++ b/libitm/configure
@@ -17884,13 +17884,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17915,7 +17916,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -3460,13 +3460,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3491,7 +3492,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -10778,7 +10779,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10781 "configure"
+#line 10782 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -10884,7 +10885,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10887 "configure"
+#line 10888 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -5580,13 +5580,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5611,7 +5612,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -11737,7 +11738,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11740 "configure"
+#line 11741 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11843,7 +11844,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11846 "configure"
+#line 11847 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -13033,13 +13033,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13064,7 +13065,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -16856,13 +16856,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16887,7 +16888,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libssp/configure
+++ b/libssp/configure
@@ -4332,13 +4332,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4363,7 +4364,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -10999,7 +11000,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11002 "configure"
+#line 11003 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11105,7 +11106,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11108 "configure"
+#line 11109 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -77482,13 +77482,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -77513,7 +77514,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -15674,13 +15674,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15705,7 +15706,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
--- a/lto-plugin/configure
+++ b/lto-plugin/configure
@@ -5682,7 +5682,7 @@ $as_echo_n "checking for CET support... " >&6; }
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    may_have_cet=yes
-    save_CFLAGS="$CFLAGS"
+    cet_save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fcf-protection"
    case "$enable_cet" in
      auto)
@@ -5733,7 +5733,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	;;
    esac
-    CFLAGS="$save_CFLAGS"
+    CFLAGS="$cet_save_CFLAGS"
    ;;
  *)
    may_have_cet=no
@@ -5741,9 +5741,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ;;
 esac

-save_CFLAGS="$CFLAGS"
+cet_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fcf-protection=none"
-save_LDFLAGS="$LDFLAGS"
+cet_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,-z,ibt,-z,shstk"
 if test x$may_have_cet = xyes; then
  # Check whether -fcf-protection=none -Wl,-z,ibt,-z,shstk work.
@@ -5831,8 +5831,8 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-CFLAGS="$save_CFLAGS"
-LDFLAGS="$save_LDFLAGS"
+CFLAGS="$cet_save_CFLAGS"
+LDFLAGS="$cet_save_LDFLAGS"



--- a/zlib/configure
+++ b/zlib/configure
@@ -4163,13 +4163,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5
 $as_echo_n "checking for CET support... " >&6; }

+# NB: Avoid nested save_CFLAGS and save_LDFLAGS.
 case "$host" in
  i[34567]86-*-linux* | x86_64-*-linux*)
    case "$enable_cet" in
      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
-	save_CFLAGS="$CFLAGS"
+	cet_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fcf-protection"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4194,7 +4195,7 @@ else
  enable_cet=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
+	CFLAGS="$cet_save_CFLAGS"
 	;;
      yes)
 	# Check if assembler supports CET.
@@ -10742,7 +10743,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10745 "configure"
+#line 10746 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -10848,7 +10849,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10851 "configure"
+#line 10852 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H