From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 426FA38708CB; Tue, 28 Mar 2023 23:34:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 426FA38708CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680046449; bh=P9n9D+N0adUjFwN/Jtj2lmFpCZJt2rXmbAMZGtEvYeM=; h=From:To:Subject:Date:From; b=Vux/EMzInvyzdV/pHs7835GCMJ8KXB8HAS4JdpSathqP+R2sJTlnWDQgVVHj9aY4F M1jL8k7AK3PrUsZpjjPqza1q6zMvus1H/J7QGzsxuDvDjNfBWkbF8ylsnUGU7H1KO4 wD0d7hHWFvgVKysDzmuyKCKq94VVL+hUzIrgG48s= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-9333] libstdc++: Fix orphaned/nested output of configure checks X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: ba38746440750c0df96ac05d080ab9f78afe7412 X-Git-Newrev: 274907c73647d2a1394523bd0e714aa920b51595 Message-Id: <20230328233409.426FA38708CB@sourceware.org> Date: Tue, 28 Mar 2023 23:34:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:274907c73647d2a1394523bd0e714aa920b51595 commit r12-9333-g274907c73647d2a1394523bd0e714aa920b51595 Author: Jonathan Wakely Date: Fri Nov 25 11:40:37 2022 +0000 libstdc++: Fix orphaned/nested output of configure checks This moves two AC_MSG_RESULT lines for features so that they are only printed when the corresponding AC_MSG_CHECKING actually happened. This fixes configure output like: checking for uchar.h... no no checking for int64_t... yes Also move the AC_MSG_CHECKING for libbacktrace support so it doesn't come after AC_CHECK_HEADERS output. This fixes: checking whether to build libbacktrace support... checking for sys/mman.h... (cached) yes yes libstdc++-v3/ChangeLog: * acinclude.m4 (GLIBCXX_CHECK_UCHAR_H): Don't use AC_MSG_RESULT unless the AC_MSG_CHECKING happened. * configure: Regenerate. (cherry picked from commit 7b648e8313fdad9b782986eabf0c25253e6ff37e) Diff: --- libstdc++-v3/acinclude.m4 | 6 +++--- libstdc++-v3/configure | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index e3cc3a8e867..04f2153fce3 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2060,10 +2060,10 @@ AC_DEFUN([GLIBCXX_CHECK_UCHAR_H], [ ], [], [ac_uchar_c8rtomb_mbrtoc8_fchar8_t=yes], [ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no]) + AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_fchar8_t) else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi - AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_fchar8_t) if test x"$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_FCHAR8_T, 1, [Define if c8rtomb and mbrtoc8 functions in should be @@ -2082,10 +2082,10 @@ AC_DEFUN([GLIBCXX_CHECK_UCHAR_H], [ ], [], [ac_uchar_c8rtomb_mbrtoc8_cxx20=yes], [ac_uchar_c8rtomb_mbrtoc8_cxx20=no]) + AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_cxx20) else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi - AC_MSG_RESULT($ac_uchar_c8rtomb_mbrtoc8_cxx20) if test x"$ac_uchar_c8rtomb_mbrtoc8_cxx20" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_CXX20, 1, [Define if c8rtomb and mbrtoc8 functions in should be @@ -5022,6 +5022,7 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi + AC_MSG_RESULT($enable_libstdcxx_backtrace) if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 @@ -5068,7 +5069,6 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" BACKTRACE_USES_MALLOC=0 BACKTRACE_SUPPORTS_THREADS=0 fi - AC_MSG_RESULT($enable_libstdcxx_backtrace) GLIBCXX_CONDITIONAL(ENABLE_BACKTRACE, [test "$enable_libstdcxx_backtrace" = yes]) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index eac60392121..c07e2756974 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19184,11 +19184,11 @@ else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&5 +$as_echo "$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&6; } else ac_uchar_c8rtomb_mbrtoc8_fchar8_t=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&5 -$as_echo "$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" >&6; } if test x"$ac_uchar_c8rtomb_mbrtoc8_fchar8_t" = x"yes"; then $as_echo "#define _GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_FCHAR8_T 1" >>confdefs.h @@ -19222,11 +19222,11 @@ else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_cxx20" >&5 +$as_echo "$ac_uchar_c8rtomb_mbrtoc8_cxx20" >&6; } else ac_uchar_c8rtomb_mbrtoc8_cxx20=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_uchar_c8rtomb_mbrtoc8_cxx20" >&5 -$as_echo "$ac_uchar_c8rtomb_mbrtoc8_cxx20" >&6; } if test x"$ac_uchar_c8rtomb_mbrtoc8_cxx20" = x"yes"; then $as_echo "#define _GLIBCXX_USE_UCHAR_C8RTOMB_MBRTOC8_CXX20 1" >>confdefs.h @@ -77526,6 +77526,8 @@ $as_echo_n "checking whether to build libbacktrace support... " >&6; } if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libstdcxx_backtrace" >&5 +$as_echo "$enable_libstdcxx_backtrace" >&6; } if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 @@ -77594,8 +77596,6 @@ $as_echo "#define HAVE_STACKTRACE 1" >>confdefs.h BACKTRACE_USES_MALLOC=0 BACKTRACE_SUPPORTS_THREADS=0 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libstdcxx_backtrace" >&5 -$as_echo "$enable_libstdcxx_backtrace" >&6; }