summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure24
-rw-r--r--gcc/configure.ac22
3 files changed, 33 insertions, 19 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1478197c2c8..c4098afaa47 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-22 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * configure.ac: Allow --disable-coverage-flags (for the future benefit
+ of top level bootstrap, and consistency). Reindent.
+ * configure: Regenerate.
+
2004-03-21 Kazu Hirata <kazu@cs.umass.edu>
* bt-load.c, builtins.c, cfghooks.c, cfgrtl.c, gcse.c,
diff --git a/gcc/configure b/gcc/configure
index bb83bc1b477..f096f8be65a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -4494,17 +4494,21 @@ fi
if test "${enable_coverage+set}" = set; then
enableval="$enable_coverage"
case "${enableval}" in
-yes|noopt)
- coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O0"
- ;;
-opt)
- coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O2"
- ;;
-*)
- { { echo "$as_me:$LINENO: error: unknown coverage setting $enableval" >&5
+ yes|noopt)
+ coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O0"
+ ;;
+ opt)
+ coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O2"
+ ;;
+ no)
+ # a.k.a. --disable-coverage
+ coverage_flags=""
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: unknown coverage setting $enableval" >&5
echo "$as_me: error: unknown coverage setting $enableval" >&2;}
{ (exit 1); exit 1; }; }
- ;;
+ ;;
esac
else
coverage_flags=""
@@ -5138,7 +5142,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
else
ac_prog_version=`$MAKEINFO --version 2>&1 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
- echo "configure:5141: version of makeinfo is $ac_prog_version" >&5
+ echo "configure:5145: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 775be55690a..9ea7dfa5f1e 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -474,15 +474,19 @@ AC_ARG_ENABLE(coverage,
optimization. Values are opt, noopt,
default is noopt],
[case "${enableval}" in
-yes|noopt)
- coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O0"
- ;;
-opt)
- coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O2"
- ;;
-*)
- AC_MSG_ERROR(unknown coverage setting $enableval)
- ;;
+ yes|noopt)
+ coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O0"
+ ;;
+ opt)
+ coverage_flags="-fprofile-arcs -ftest-coverage -frandom-seed=\$@ -O2"
+ ;;
+ no)
+ # a.k.a. --disable-coverage
+ coverage_flags=""
+ ;;
+ *)
+ AC_MSG_ERROR(unknown coverage setting $enableval)
+ ;;
esac],
[coverage_flags=""])
AC_SUBST(coverage_flags)