re PR bootstrap/72823 (r239175 causes build failure)

	PR bootstrap/72823
	* configure.ac (ENABLE_ASSERT_CHECKING): Define if gcc configure
	would define that macro.
	* configure: Regenerated.
	* config.in: Regenerated.

From-SVN: r242510

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index a298a2fcef6c564b4a84ffe830ff8c2740604471..7690b5deba9a548d5af35490608b5892c3f56de7 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2016-11-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR bootstrap/72823
+       * configure.ac (ENABLE_ASSERT_CHECKING): Define if gcc configure
+       would define that macro.
+       * configure: Regenerated.
+       * config.in: Regenerated.
+
 2016-11-08  Richard Earnshaw  <rearnsha@arm.com>
 
        * lex.c (search_line_fast): New implementation for AArch64.

diff --git a/libcpp/config.in b/libcpp/config.in
index 3bbffe7815e75e6f713cd01ac482e29fd857fe1e..dd489a5f402bf0f1e9ee783414681181f9c32910 100644 (file)
--- a/libcpp/config.in
+++ b/libcpp/config.in
@@ -14,6 +14,9 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
+/* Define if you want assertions enabled. This is a cheap check. */
+#undef ENABLE_ASSERT_CHECKING
+
 /* Define to enable system headers canonicalization. */
 #undef ENABLE_CANONICAL_SYSTEM_HEADERS
 

diff --git a/libcpp/configure b/libcpp/configure
index b6f129c48b9ac3aaebb8952b513e44ae7a978dd8..12c1907ed40dfe77783ff90df7a1ac2fce4382c5 100755 (executable)
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7288,9 +7288,11 @@ for check in release $ac_checking_flags
 do
        case $check in
        # these set all the flags to specific states
-       yes|all) ac_checking=1 ; ac_valgrind_checking= ;;
-       no|none|release) ac_checking= ; ac_valgrind_checking= ;;
+       yes|all) ac_checking=1 ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
+       no|none) ac_checking= ; ac_assert_checking= ; ac_valgrind_checking= ;;
+       release) ac_checking= ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
        # these enable particular checks
+       assert) ac_assert_checking=1 ;;
        misc) ac_checking=1 ;;
        valgrind) ac_valgrind_checking=1 ;;
        # accept
@@ -7308,6 +7310,12 @@ else
 
 fi
 
+if test x$ac_assert_checking != x ; then
+
+$as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h
+
+fi
+
 if test x$ac_valgrind_checking != x ; then
 
 $as_echo "#define ENABLE_VALGRIND_CHECKING 1" >>confdefs.h

diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index 3077ee09768b231f2d17b4a9783198bd79f5dfdc..d0a59dc3e0f8adad7bfe468853f7700de48ec588 100644 (file)
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -152,9 +152,11 @@ for check in release $ac_checking_flags
 do
        case $check in
        # these set all the flags to specific states
-       yes|all) ac_checking=1 ; ac_valgrind_checking= ;;
-       no|none|release) ac_checking= ; ac_valgrind_checking= ;;
+       yes|all) ac_checking=1 ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
+       no|none) ac_checking= ; ac_assert_checking= ; ac_valgrind_checking= ;;
+       release) ac_checking= ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
        # these enable particular checks
+       assert) ac_assert_checking=1 ;;
        misc) ac_checking=1 ;;
        valgrind) ac_valgrind_checking=1 ;;
        # accept
@@ -170,6 +172,11 @@ else
   AC_DEFINE(CHECKING_P, 0)
 fi
 
+if test x$ac_assert_checking != x ; then
+  AC_DEFINE(ENABLE_ASSERT_CHECKING, 1,
+[Define if you want assertions enabled.  This is a cheap check.])
+fi
+
 if test x$ac_valgrind_checking != x ; then
   AC_DEFINE(ENABLE_VALGRIND_CHECKING, 1,
 [Define if you want to workaround valgrind (a memory checker) warnings about