libstdc++: Restore printing of assertion messages [PR102100]

My changes for PR 101429 broke the _-replacement_assert function,
because we now always just abort without printing anything. That's
because I added checks for _GLIBCXX_HOSTED and _GLIBCXX_VERBOSE, but the
checks are done before those get defined.

This adds a new macro which is set
by the sed command in include/Makefile, once the HOSTED and VERBOSE
macros have been set by the configure script.

libstdc++-v3/ChangeLog:

	PR libstdc++/102100
	* include/Makefile.am (c++config.h): Define
	_GLIBCXX_VERBOSE_ASSERT based on configure output.
	* include/Makefile.in: Regenerate.
	* include/bits/c++config: Fix condition for verbose assertions.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 15c0ad8dd03c4d609cd3f1fd20e931895dc4dcb8..5a5b5fd1d1b8c7d841fffe87f1fcdc709ed6cf3b 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1315,6 +1315,12 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
        grep "^[         ]*#[    ]*define[       ][      ]*_GLIBCXX_LONG_DOUBLE_ALT128_COMPAT[   ][      ]*1[    ]*$$" \
        ${CONFIG_HEADER} > /dev/null 2>&1 \
        && ldbl_alt128_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT 1,' ;\
+       verbose_assert='s,g,g,' ; \
+       grep "^[         ]*#[    ]*define[       ][      ]*_GLIBCXX_HOSTED[      ][      ]*1[    ]*$$" \
+       ${CONFIG_HEADER} > /dev/null 2>&1 \
+       && grep "^[      ]*#[    ]*define[       ][      ]*_GLIBCXX_VERBOSE[     ][      ]*1[    ]*$$" \
+       ${CONFIG_HEADER} > /dev/null 2>&1 \
+       && verbose_assert='s,^#undef _GLIBCXX_VERBOSE_ASSERT$$,#define _GLIBCXX_VERBOSE_ASSERT 1,' ;\
        sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
        -e "s,define _GLIBCXX_RELEASE,define _GLIBCXX_RELEASE $$release," \
        -e "s,define _GLIBCXX_INLINE_VERSION, define _GLIBCXX_INLINE_VERSION $$ns_version," \
@@ -1326,6 +1332,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
        -e "s,define _GLIBCXX_USE_FLOAT128,$$float128," \
        -e "$$ldbl_compat" \
        -e "$$ldbl_alt128_compat" \
+       -e "$$verbose_assert" \
            < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
        sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
            -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 9d559e2806c8f1e1282eb0b157eec06ef0a2445c..8402cd704b4f015bbfca26e1ba2b295280ebd4db 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1801,6 +1801,12 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
        grep "^[         ]*#[    ]*define[       ][      ]*_GLIBCXX_LONG_DOUBLE_ALT128_COMPAT[   ][      ]*1[    ]*$$" \
        ${CONFIG_HEADER} > /dev/null 2>&1 \
        && ldbl_alt128_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT 1,' ;\
+       verbose_assert='s,g,g,' ; \
+       grep "^[         ]*#[    ]*define[       ][      ]*_GLIBCXX_HOSTED[      ][      ]*1[    ]*$$" \
+       ${CONFIG_HEADER} > /dev/null 2>&1 \
+       && grep "^[      ]*#[    ]*define[       ][      ]*_GLIBCXX_VERBOSE[     ][      ]*1[    ]*$$" \
+       ${CONFIG_HEADER} > /dev/null 2>&1 \
+       && verbose_assert='s,^#undef _GLIBCXX_VERBOSE_ASSERT$$,#define _GLIBCXX_VERBOSE_ASSERT 1,' ;\
        sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
        -e "s,define _GLIBCXX_RELEASE,define _GLIBCXX_RELEASE $$release," \
        -e "s,define _GLIBCXX_INLINE_VERSION, define _GLIBCXX_INLINE_VERSION $$ns_version," \
@@ -1812,6 +1818,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
        -e "s,define _GLIBCXX_USE_FLOAT128,$$float128," \
        -e "$$ldbl_compat" \
        -e "$$ldbl_alt128_compat" \
+       -e "$$verbose_assert" \
            < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
        sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
            -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 32b8957f8140c64f8a8a4a84e64dc1e7a0e07df0..69343a25533678fa114be5ca245b8b8a709f166e 100644 (file)
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -506,11 +506,12 @@ namespace std
 # define __glibcxx_constexpr_assert(unevaluated)
 #endif
 
+#undef _GLIBCXX_VERBOSE_ASSERT
 
 // Assert.
 #if defined(_GLIBCXX_ASSERTIONS) \
   || defined(_GLIBCXX_PARALLEL) || defined(_GLIBCXX_PARALLEL_ASSERTIONS)
-# if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE
+# ifdef _GLIBCXX_VERBOSE_ASSERT
 namespace std
 {
   // Avoid the use of assert, because we're trying to keep the <cassert>
@@ -533,7 +534,7 @@ namespace std
     std::__replacement_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \
                              #_Condition);                            \
   }
-# else // ! VERBOSE
+# else // ! VERBOSE_ASSERT
 # define __glibcxx_assert_impl(_Condition)             \
   if (__builtin_expect(!bool(_Condition), false))      \
   {                                                    \