merge from gcc

diff --git a/config/ChangeLog b/config/ChangeLog
index 809396ba4e910724c347bc68e3b9dd95085865c0..7d7dd7e11aa4b13c3bc90918c1850586dfdbc90c 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-15  Zack Weinberg  <zack@codesourcery.com>
+
+       * gcc-version.m4: Delete.
+
 2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
 
        PR bootstrap/17383

diff --git a/config/gcc-version.m4 b/config/gcc-version.m4
deleted file mode 100644 (file)
index 8de74bb..0000000
--- a/config/gcc-version.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl Usage: TL_AC_GCC_VERSION(TOPSRCDIR)
-dnl
-dnl Set up the variables:
-dnl
-dnl     gcc_version_trigger: pathname of gcc's version.c, if available
-dnl     gcc_version_full: full gcc version string
-dnl     gcc_version: the first "word" in $gcc_version_full
-dnl
-dnl TOPSRCDIR is the top-level source directory.
-AC_DEFUN([TL_AC_GCC_VERSION],
-[
-changequote(,)dnl
-if test "${with_gcc_version_trigger+set}" = set; then
-  gcc_version_trigger=$with_gcc_version_trigger
-else
-  gcc_version_trigger=$1/gcc/version.c
-fi
-if test -f "${gcc_version_trigger}"; then
-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
-else
-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
-fi
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-changequote([,])dnl
-AC_SUBST(gcc_version_trigger)
-AC_SUBST(gcc_version_full)
-AC_SUBST(gcc_version)
-])dnl