Avoid nested save_CFLAGS and save_LDFLAGS

author H.J. Lu <hjl.tools@gmail.com>

Fri, 29 May 2020 19:23:33 +0000 (12:23 -0700)

committer H.J. Lu <hjl.tools@gmail.com>

Fri, 29 May 2020 19:56:40 +0000 (12:56 -0700)
author H.J. Lu <hjl.tools@gmail.com>
Fri, 29 May 2020 19:23:33 +0000 (12:23 -0700)
committer H.J. Lu <hjl.tools@gmail.com>
Fri, 29 May 2020 19:56:40 +0000 (12:56 -0700)
diff --git a/config/cet.m4 b/config/cet.m4

index 2bb2c8a95ac1b59f83ef6376f7de7b90b077e342..911fbd4647577dd2adae4dcee316ea58eaf0cc8f 100644 (file)
--- 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"
  ])
diff --git a/gcc/configure b/gcc/configure

index 4531d50eb0fec1456610f1afbed964704cb623f1..468507104245fc18c358e7e5a660744d1eeb92b5 100755 (executable)
--- 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*)
diff --git a/libatomic/configure b/libatomic/configure

index 478670a6fe702c2df53a3c63744049fa900106e0..b441636c85b4adcd6574e077eaeab1b62fff71db 100755 (executable)
--- 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.
diff --git a/libbacktrace/configure b/libbacktrace/configure

index d851e807d2d60a01fdf079ff5f6f5bfff5535376..b453bae5ae69ecf86ee74b16046b27d3c4dd77f8 100755 (executable)
--- 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*)
diff --git a/libcc1/configure b/libcc1/configure

index 5e790db36b0a1e5448b9b15a7497d2bcf04a7780..37dbeac490806a558d32b73c1c8632ce09d04864 100755 (executable)
--- 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"
  
  
  
diff --git a/libcpp/configure b/libcpp/configure

index 6a967cff6acb253ab89da6a961b8715f778e17c0..3329e20c392a41732c28fec9c3be912ac23bb7d0 100755 (executable)
--- 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*)
diff --git a/libdecnumber/configure b/libdecnumber/configure

index 577b250930c0189669ce763d096d6fb0a16ae921..df6fdcfbc7f74a732006fb0cfa94937459fec1c4 100755 (executable)
--- 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*)
diff --git a/libgcc/configure b/libgcc/configure

index 5d0c79bcd75c47879ac1ede1f13d3fe7ae5d542f..13548cacb8518f88dc36bc201d4c25bdacc98bf6 100755 (executable)
--- 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.
diff --git a/libgfortran/configure b/libgfortran/configure

index 97d9616e425603f056ec6033cc1769e2f6e47f17..195f8bbce4c8f8b07e9c9d06e19021e9c83afcaa 100755 (executable)
--- 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
diff --git a/libgomp/configure b/libgomp/configure

index e5710b26749176313b98d26c0585a8822af4ae60..9ffa66c18d9f651464ebea2be859c693344aa3f7 100755 (executable)
--- 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.
diff --git a/libiberty/configure b/libiberty/configure

index 3f82c5bb865cb09edd605138a8e7bf98c32f3f45..1f8e23f0d235a6a5d5158bf6705023db95ac7023 100755 (executable)
--- 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"
  
  
  
diff --git a/libitm/configure b/libitm/configure

index be70ea6f76f03c7ebbbd4965a631d0c1fc889e7e..90965f339fcb8f31d9d5d04cff0e5470244f22a2 100755 (executable)
--- 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.
diff --git a/libobjc/configure b/libobjc/configure

index 6975a727d5e75d2797d298c9ce3dd3e44695c233..c4f66880924bd1ed57517c600c9e065c33b2ec4a 100755 (executable)
--- 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
diff --git a/libphobos/configure b/libphobos/configure

index 4551e9fddefc4b2445c8552da2b7880fc68a9a79..a8d151cdccbee0e7b14b8b97d449689d59ee6113 100755 (executable)
--- 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
diff --git a/libquadmath/configure b/libquadmath/configure

index dee79cf99a02f95db92725053a53ad69ff90f150..a28788aae8c47c3018a925840e3858f53fc8b677 100755 (executable)
--- 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.
diff --git a/libsanitizer/configure b/libsanitizer/configure

index 7ec074491c1a28b9818ce48f2a18a946f8b90d9f..04eca04fbe5e59bae1ba00597de0cf1b7cf1b5fa 100755 (executable)
--- 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.
diff --git a/libssp/configure b/libssp/configure

index 2eb4c7998d5f0810bb91d38a713bbbda1e245b25..ff342ac6e1fee096436b0e19865d8d62e87ed5f6 100755 (executable)
--- 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
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure

index 502f660200121b9b8be2a059d4db2f5dca9a2734..b5beb456a6255a415de894e47fb8098b0c456f5d 100755 (executable)
--- 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.
diff --git a/libvtv/configure b/libvtv/configure

index eced2b23ce09cb025337ae478c08f47a8e599f10..b796e0197d5d964909151b2c5d6542b059ac0471 100755 (executable)
--- 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.
diff --git a/lto-plugin/configure b/lto-plugin/configure

index 36c6ecc5875ddf13b4bcd85f7f2317f7a99690f7..69f6fce05c583694def2ff9844f39f25bb120707 100755 (executable)
--- 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"
  
  
  
diff --git a/zlib/configure b/zlib/configure

index ae1f193491175d222c9c5c975bdbecb0a50d2184..f9a2689e05c2d5573ea0d19349f80a0938fdd535 100755 (executable)
--- 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
author	H.J. Lu <hjl.tools@gmail.com>
	Fri, 29 May 2020 19:23:33 +0000 (12:23 -0700)
committer	H.J. Lu <hjl.tools@gmail.com>
	Fri, 29 May 2020 19:56:40 +0000 (12:56 -0700)
config/cet.m4		patch \| blob \| history
gcc/configure		patch \| blob \| history
libatomic/configure		patch \| blob \| history
libbacktrace/configure		patch \| blob \| history
libcc1/configure		patch \| blob \| history
libcpp/configure		patch \| blob \| history
libdecnumber/configure		patch \| blob \| history
libgcc/configure		patch \| blob \| history
libgfortran/configure		patch \| blob \| history
libgomp/configure		patch \| blob \| history
libiberty/configure		patch \| blob \| history
libitm/configure		patch \| blob \| history
libobjc/configure		patch \| blob \| history
libphobos/configure		patch \| blob \| history
libquadmath/configure		patch \| blob \| history
libsanitizer/configure		patch \| blob \| history
libssp/configure		patch \| blob \| history
libstdc++-v3/configure		patch \| blob \| history
libvtv/configure		patch \| blob \| history
lto-plugin/configure		patch \| blob \| history
zlib/configure		patch \| blob \| history