From 652702b0c93644a44ad5bdfd4ff260d0f69a084b Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 16 Dec 2020 18:21:32 +0100
Subject: [PATCH] libcody: fix --enable-checking=... follow-up [PR98311]

> The -enable-checking configure code in libcody didn't play well with
> us.  This just uses libcpp's configurey for that piece.

This doesn't set is_release anywhere, which means when --enable-checking*
or --disable-checking isn't specified, it always treats it as
--enable-checking=yes, while the normal gcc behavior is treat only trunk
as --enable-checking=yes and treat release branches as
--enable-checking=release by default.

On the other side, nothing uses those ac_assert_checking and
ac_valgrind_checking variables, so it is a waste to compute those.

2020-12-16  Jakub Jelinek  <jakub@redhat.com>

	* configure.ac: Compute is_release.
	(NMS_ENABLE_CHECKING): Simplify but not computing ac_assert_checking
	and ac_valgrind_checking the code doesn't use.
	* configure: Regenerated.
---
 libcody/configure    | 18 ++++++++++--------
 libcody/configure.ac | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libcody/configure b/libcody/configure
index 76ff932d61b..7699e7a1b2f 100755
--- a/libcody/configure
+++ b/libcody/configure
@@ -2686,6 +2686,14 @@ configure_args=$ac_configure_args
 
 
 
+# Enable expensive internal checks
+is_release=
+if test -d $srcdir/../gcc \
+   && test -f $srcdir/../gcc/DEV-PHASE \
+   && test x"`cat $srcdir/../gcc/DEV-PHASE`" != xexperimental; then
+  is_release=yes
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking bugurl" >&5
 $as_echo_n "checking bugurl... " >&6; }
 
@@ -2727,14 +2735,8 @@ IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="$IFS,"
 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_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 ;;
+	yes|all|misc) ac_checking=1 ;;
+	no|none|release) ac_checking= ;;
 	# accept
 	*) ;;
 	esac
diff --git a/libcody/configure.ac b/libcody/configure.ac
index c3db5534f1f..7461dcf4b9c 100644
--- a/libcody/configure.ac
+++ b/libcody/configure.ac
@@ -23,6 +23,14 @@ NMS_TOOL_DIRS
 NMS_LINK_OPT([-Wl,--no-undefined])
 NMS_CONFIG_FILES([gdbinit dox.cfg])
 
+# Enable expensive internal checks
+is_release=
+if test -d $srcdir/../gcc \
+   && test -f $srcdir/../gcc/DEV-PHASE \
+   && test x"`cat $srcdir/../gcc/DEV-PHASE`" != xexperimental; then
+  is_release=yes
+fi
+
 NMS_BUGURL
 dnl NMS_ENABLE_CHECKING
 dnl cloned from ../libcpp/configure.ac
@@ -43,14 +51,8 @@ IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="$IFS,"
 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_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 ;;
+	yes|all|misc) ac_checking=1 ;;
+	no|none|release) ac_checking= ;;
 	# accept
 	*) ;;
 	esac