aboutsummaryrefslogtreecommitdiff
path: root/zlib/configure
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-05-29 12:23:33 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-05-29 12:56:40 -0700
commit9051b548274bffef9f41e720e1894d12cf68a47c (patch)
tree5b382dcf5ffd2a24dbdb58ebec70bfe0beac215c /zlib/configure
parent7deca8c0b3765787627b11387b56b97b01a8bf33 (diff)
downloadgcc-9051b548274bffef9f41e720e1894d12cf68a47c.zip
gcc-9051b548274bffef9f41e720e1894d12cf68a47c.tar.gz
gcc-9051b548274bffef9f41e720e1894d12cf68a47c.tar.bz2
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.
Diffstat (limited to 'zlib/configure')
-rwxr-xr-xzlib/configure9
1 files changed, 5 insertions, 4 deletions
diff --git a/zlib/configure b/zlib/configure
index ae1f193..f9a2689 100755
--- 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