From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A836C384EF4A; Fri, 25 Nov 2022 15:07:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A836C384EF4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669388874; bh=wLpnDM2zo3qR58WDgQX+jLa2Uk6juoK5v7hnA3mlrsA=; h=From:To:Subject:Date:From; b=yZ/F0cfBH1fGl1lF4+4LnejMCenW8Q/NZ898+IzqNffP1y5eV5Yz00hrF0gyfHaQh 3dNvMgDi2k8zDlCyWWOTYtRqHQm5mdxWY/ZA1gifmGS0KDpLLvrDyv5C7zYCmNU9FX F6LhDmQcxa4jQjw5jIMK87zImJ4BHLN7NbRNIRbY= 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 r13-4307] libstdc++: Fix orphaned/nested output of configure checks X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f54ceb2062c7fef294f85ae093914fa6c7ca35b8 X-Git-Newrev: 7b648e8313fdad9b782986eabf0c25253e6ff37e Message-Id: <20221125150754.A836C384EF4A@sourceware.org> Date: Fri, 25 Nov 2022 15:07:54 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7b648e8313fdad9b782986eabf0c25253e6ff37e commit r13-4307-g7b648e8313fdad9b782986eabf0c25253e6ff37e 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. 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 baf01913a90..b957c728ba1 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 @@ -5045,6 +5045,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 @@ -5091,7 +5092,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 31ccff5da0d..1f7017c08a4 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19215,11 +19215,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 @@ -19253,11 +19253,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 @@ -71212,6 +71212,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 @@ -71280,8 +71282,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; }