* Makefile.in (gnucompare): Do comparison of all files using one of

	the chosen methods and only afterwards decide if just warning should
	be issued or comparison failure raised.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@106707 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96381d7..44efa5b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-09  Jakub Jelinek  <jakub@redhat.com>
+
+       * Makefile.in (gnucompare): Do comparison of all files using one of
+       the chosen methods and only afterwards decide if just warning should
+       be issued or comparison failure raised.
+

 2005-11-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * ifcvt.c (noce_get_alt_condition): Use prev_nonnote_insn.
 2005-11-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * ifcvt.c (noce_get_alt_condition): Use prev_nonnote_insn.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8bba4e0..4fbbd6c 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4241,30 +4241,30 @@ fastcompare fastcompare3 fastcompare4 fastcompare-lean fastcompare3-lean fastcom
        for dir in . $(SUBDIRS) libgcc; do \
          if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
            for file in $$dir/*$(objext); do \
        for dir in . $(SUBDIRS) libgcc; do \
          if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
            for file in $$dir/*$(objext); do \

-             case $$file in \
-               ./cc*-checksum$(objext) | libgcc/* ) \
-                   tail +16c ./$$file > tmp-foo1 \
-                   && tail +16c stage$$stage/$$file > tmp-foo2 \
-                   && ( cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 \
-                        || echo warning: $$file differs || true ) \
+             case "$@" in \
+               slowcompare* ) \
+                 tail +16c ./$$file > tmp-foo1; \
+                 tail +16c stage$$stage/$$file > tmp-foo2; \
+                 cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1; \
+                 cmpret=$$?; \
+                 ;; \
+               fastcompare* ) \
+                 cmp $$file stage$$stage/$$file 16 16 > /dev/null 2>&1; \
+                 cmpret=$$?; \
+                 ;; \
+               gnucompare* ) \
+                 cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
+                 cmpret=$$?; \

                  ;; \
                  ;; \

-               *)  case "$@" in \
-                 slowcompare* ) \
-                   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; \
-                   ;; \
-                 fastcompare* ) \
-                   cmp $$file stage$$stage/$$file 16 16 > /dev/null 2>&1; \
-                   test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-                   ;; \
-                 gnucompare* ) \
-                   cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
-                   test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-                   ;; \
-               esac ; \

              esac ; \
              esac ; \

+             if test $$cmpret -eq 1; then \
+               case $$file in \
+                 ./cc*-checksum$(objext) | libgcc/* ) \
+                   echo warning: $$file differs;; \
+                 *) \
+                   echo $$file differs >> .bad_compare;; \
+               esac ; \
+             fi; \

            done; \
          else true; fi; \
        done
            done; \
          else true; fi; \
        done