diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-05-29 12:23:33 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-05-29 12:56:40 -0700 |
| commit | 9051b548274bffef9f41e720e1894d12cf68a47c (patch) | |
| tree | 5b382dcf5ffd2a24dbdb58ebec70bfe0beac215c /libbacktrace | |
| parent | 7deca8c0b3765787627b11387b56b97b01a8bf33 (diff) | |
| download | gcc-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 'libbacktrace')
| -rwxr-xr-x | libbacktrace/configure | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libbacktrace/configure b/libbacktrace/configure index d851e80..b453bae 100755 --- 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*) |