configure.in (make_compare_target): Test for GNU cmp and set this variable appropriately.

2003-04-25  Phil Edwards  <pme@gcc.gnu.org>

	* configure.in (make_compare_target):  Test for GNU cmp and set this
	variable appropriately.
	* Makefile.in (compare, compare3, compare4, compare-lean, compare3-lean,
	compare4-lean): Rename actual targets to slowcompare*.  New compare*
	targets depend on names based on make_compare_target.
	* configure:  Regenerated.

From-SVN: r66075

gcc/ChangeLog

+2003-04-25  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in (make_compare_target):  Test for GNU cmp and set this
+	variable appropriately.
+	* Makefile.in (compare, compare3, compare4, compare-lean, compare3-lean,
+	compare4-lean): Rename actual targets to slowcompare*.  New compare*
+	targets depend on names based on make_compare_target.
+	* configure:  Regenerated.
+
 2003-04-25  Richard Henderson  <rth@redhat.com>
 
 	* config/ia64/ia64.c (ia64_compute_frame_size): Allow inline asm

gcc/Makefile.in

@@ -3614,17 +3614,16 @@ restrap:
 
 # Compare the object files in the current directory with those in the
 # stage2 directory.
-
 # ./ avoids bug in some versions of tail.
-compare compare3 compare4 compare-lean compare3-lean compare4-lean: force
+slowcompare slowcompare3 slowcompare4 slowcompare-lean slowcompare3-lean slowcompare4-lean: force
 	-rm -f .bad_compare
-	case "$@" in compare | compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	for file in *$(objext); do \
 	  tail +16c ./$$file > tmp-foo1; \
 	  tail +16c stage$$stage/$$file > tmp-foo2 \
 	    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
 	done
-	case "$@" in compare | compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	for dir in tmp-foo intl $(SUBDIRS); do \
 	  if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
 	    for file in $$dir/*$(objext); do \
@@ -3635,7 +3634,7 @@ compare compare3 compare4 compare-lean compare3-lean compare4-lean: force
 	  else true; fi; \
 	done
 	-rm -f tmp-foo*
-	case "$@" in compare | compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
 	  cat .bad_compare; \
@@ -3679,6 +3678,14 @@ gnucompare gnucompare3 gnucompare4 gnucompare-lean gnucompare3-lean gnucompare4-
 	  esac; true; \
 	fi
 
+# Forwarding wrappers to the most appropriate version.
+compare: @make_compare_target@
+compare3: @make_compare_target@3
+compare4: @make_compare_target@4
+compare-lean: @make_compare_target@-lean
+compare3-lean: @make_compare_target@3-lean
+compare4-lean: @make_compare_target@4-lean
+
 # Copy the object files from a particular stage into a subdirectory.
 stage1-start:
 	-if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi

gcc/configure.in

@@ -645,6 +645,17 @@ else
   GENERATED_MANPAGES=
 fi
 
+# If GNU cmp is present and recent enough, 'make compare' can be
+# significantly faster.
+gcc_AC_CHECK_PROG_VER(gnucmp, cmp, --version,
+  [(GNU diffutils) \([0-9][0-9.]*\)], [2.[4-9]*])
+if test $gcc_cv_prog_cmp_modern = yes; then
+  make_compare_target=gnucompare
+else
+  make_compare_target=slowcompare
+fi
+AC_SUBST(make_compare_target)
+
 # How about lex?
 dnl Don't use AC_PROG_LEX; we insist on flex.
 dnl LEXLIB is not useful in gcc.