utils.c (max_size): Add special code to deal with the subtraction of a "negative...

[gcc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5808eda41aa4308efbc5e13d145d9d910128fe50..25093056279123ac5077381f8857e352826bbde0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1442,6 +1442,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
     ;;
 esac
 
+# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a
+# C++98 compiler can still start the bootstrap.
+if test "$enable_bootstrap:$GXX" = "yes:yes"; then
+  CXX="$CXX -std=c++98"
+fi
+
 # Used for setting $lt_cv_objdir
 _LT_CHECK_OBJDIR
 
@@ -2671,7 +2677,8 @@ AC_SUBST(BUILD_CONFIG)
 # Use same top-level configure hooks in libgcc/libstdc++/libvtv.
 AC_MSG_CHECKING([for --enable-vtable-verify])
 AC_ARG_ENABLE(vtable-verify,
-[  --enable-vtable-verify    Enable vtable verification feature ],
+[AS_HELP_STRING([--enable-vtable-verify],
+               [Enable vtable verification feature])],
 [case "$enableval" in
  yes) enable_vtable_verify=yes ;;
  no)  enable_vtable_verify=no ;;
@@ -3476,15 +3483,8 @@ case $build in
       *) stage1_cflags="-g -J" ;;
     esac ;;
 esac
-stage1_cxxflags='$(STAGE1_CFLAGS)'
-if test "$GCC" = yes; then
-  # Build stage 1 in C++98 mode to ensure that a C++98 compiler can still
-  # start the bootstrap.
-  stage1_cxxflags="$stage1_cxxflags -std=c++98"
-fi
 
 AC_SUBST(stage1_cflags)
-AC_SUBST(stage1_cxxflags)
 
 # Enable --enable-checking in stage1 of the compiler.
 AC_ARG_ENABLE(stage1-checking,