[v3 patch] update required compiler version, etc

[Phil Edwards <pedwards at disaster dot jaj dot com>]

Applied to mainline, rebuilt files not included.  We need 3.x to build these
days, and if we know 3.x is in use we don't need to check for other things.

This is just "useful" not "needed" so I didn't apply it to the branch.  ??



2001-02-26  Phil Edwards  <pme@sources.redhat.com>

	* acinclude.m4 (GLIBCPP_CONFIGURE):  Update required compiler version.
	  (GLIBCPP_CHECK_COMPILER_FEATURES):  Can safely assume new
	  diagnostics.  Remove WFMT_FLAGS.
	* configure.in:  Replace WFMT_FLAGS with diagnostics options.
	* libsupc++/Makefile.am:  Likewise.
	* src/Makefile.am:  Likewise.
	* aclocal.m4:  Regenerated.
	* configure:  Regenerated.
	* Makefile.in:  Regenerated.
	* libio/Makefile.in:  Regenerated.
	* libmath/Makefile.in:  Regenerated.
	* libsupc++/Makefile.in:  Regenerated.
	* src/Makefile.in:  Regenerated.


Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.131
diff -u -3 -p -r1.131 acinclude.m4
--- acinclude.m4	2001/02/16 01:56:07	1.131
+++ acinclude.m4	2001/02/26 21:42:06
@@ -17,7 +17,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   glibcpp_basedir=$auxdir/$1/libstdc++-v3
   AC_SUBST(glibcpp_basedir)
 
-  AM_INIT_AUTOMAKE(libstdc++, 2.90.8)
+  AM_INIT_AUTOMAKE(libstdc++, 2.91)
 
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
@@ -168,10 +168,10 @@ if test ! -f stamp-sanity-compiler; then
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   AC_EGREP_CPP(ok, [
-  #if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
+  #if __GNUC__ >= 3
     ok
   #endif
-  ], gpp_satisfactory=yes, AC_MSG_ERROR([please upgrade to gcc-2.95 or above]))
+  ], gpp_satisfactory=yes, AC_MSG_ERROR([please upgrade to GCC 3.0 or above]))
   AC_LANG_RESTORE
   AC_MSG_RESULT($gpp_satisfactory)
   touch stamp-sanity-compiler
@@ -184,8 +184,6 @@ dnl Test for newer compiler features, or
 dnl compiler version but not older compiler versions should be placed
 dnl here.
 dnl
-dnl Define WFMT_FLAGS='-fdiagnostics-show-location=once' if possible
-dnl 
 dnl Define WERROR='-Werror' if requested and possible; g++'s that lack the
 dnl new inlining code or the new system_header pragma will die on -Werror.
 dnl Leave it out by default and use maint-mode to use it.
@@ -209,22 +207,6 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES
     WERROR='-Werror'
   fi
 
-  # Check for more sophisticated diagnostic control.
-  AC_MSG_CHECKING([for g++ that supports -fdiagnostics-show-location=once])
-  CXXFLAGS='-Werror -fdiagnostics-show-location=once'
-  AC_TRY_COMPILE(, [int foo;
-  ], [ac_gabydiags=yes], [ac_gabydiags=no])
-  if test "$ac_test_CXXFLAGS" = set; then
-    CXXFLAGS="$ac_save_CXXFLAGS"
-  else
-    # this is the suspicious part
-    CXXFLAGS=''
-  fi
-  if test x"$ac_gabydiags" = x"yes"; then
-    WFMT_FLAGS='-fdiagnostics-show-location=once'
-  fi
-  AC_MSG_RESULT($ac_gabydiags)
-
   # Check for -ffunction-sections -fdata-sections
   AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections])
   CXXFLAGS='-Werror -ffunction-sections -fdata-sections'
@@ -243,7 +225,6 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES
 
   AC_LANG_RESTORE
   AC_SUBST(WERROR)
-  AC_SUBST(WFMT_FLAGS)
   AC_SUBST(SECTION_FLAGS)
 ])
 
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.54
diff -u -3 -p -r1.54 configure.in
--- configure.in	2001/02/11 18:15:47	1.54
+++ configure.in	2001/02/26 21:42:07
@@ -96,9 +96,7 @@ if test -n "$with_cross_host"; then
 	float.h inttypes.h])
 
 	# GLIBCPP_CHECK_COMPILER_FEATURES
-	WFMT_FLAGS='-fdiagnostics-show-location=once'
 	SECTION_FLAGS='-ffunction-sections -fdata-sections'
-	AC_SUBST(WFMT_FLAGS)
 	AC_SUBST(SECTION_FLAGS)
 	GLIBCPP_CHECK_LINKER_FEATURES
 	# GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
Index: libsupc++/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/libsupc++/Makefile.am,v
retrieving revision 1.20
diff -u -3 -p -r1.20 Makefile.am
--- Makefile.am	2001/02/16 00:43:41	1.20
+++ Makefile.am	2001/02/26 21:42:07
@@ -51,7 +51,7 @@ CONFIG_CXXFLAGS = \
 
 # Warning flags to use.
 WARN_CXXFLAGS = \
-	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
+	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.73
diff -u -3 -p -r1.73 Makefile.am
--- Makefile.am	2001/02/20 20:20:48	1.73
+++ Makefile.am	2001/02/26 21:42:07
@@ -47,7 +47,7 @@ CONFIG_CXXFLAGS = \
 
 # Warning flags to use.
 WARN_CXXFLAGS = \
-	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
+	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@