diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-11-09 22:36:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2005-11-09 22:36:06 +0100 |
| commit | 63b5e789b00fd6d14bea3ca4d090e0098b507cc6 (patch) | |
| tree | 5bbd83c1bb09b22ae7f2edd5fbabc94b5c8bd439 /gcc | |
| parent | c8e90f4053f0e366630c5147d28d4d9c56e56668 (diff) | |
| download | gcc-63b5e789b00fd6d14bea3ca4d090e0098b507cc6.zip gcc-63b5e789b00fd6d14bea3ca4d090e0098b507cc6.tar.gz gcc-63b5e789b00fd6d14bea3ca4d090e0098b507cc6.tar.bz2 | |
Makefile.in (gnucompare): Do comparison of all files using one of the chosen methods and only afterwards...
* 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.
From-SVN: r106707
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 44 |
2 files changed, 28 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96381d7..44efa5b 100644 --- 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. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 8bba4e0..4fbbd6c 100644 --- 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 \ - 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 ; \ + 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 |