Makefile.tpl ([+compare-target+]): Compare all stage directories, rather than just...

* Makefile.tpl ([+compare-target+]): Compare all stage
directories, rather than just gcc.
* Makefile.in: Rebuilt.

From-SVN: r148080

diff --git a/ChangeLog b/ChangeLog
index 7a24f1cc41a44f6b9f30791cebbb8314f74dc588..dbc057a70cf54cb299bf133d867572d64a5972bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-02  Alexandre Oliva  <aoliva@redhat.com>
+
+       * Makefile.tpl ([+compare-target+]): Compare all stage
+       directories, rather than just gcc.
+       * Makefile.in: Rebuilt.
+
 2009-06-01  Doug Kwan  <dougkwan@google.com>
 
        * configure.ac: Support gold for target arm*-*-*.

diff --git a/Makefile.in b/Makefile.in
index 7f825e76d25c1a977e76bc11e6167972888f641d..a32f0835267b0b4015ea52904a9d69cc7671d206 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53135,15 +53135,16 @@ compare:
        : $(MAKE); $(stage); \
        rm -f .bad_compare ; \
        echo Comparing stages 2 and 3 ; \
-       cd stage3-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
+        sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
+       files=`find stage3-* -name "*$(objext)" -print | \
+                sed -n s,^stage$$sed-,,p` ; \
        for file in $${files} ; do \
-         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
+         f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
+         if test ! -f $$f1; then continue; fi; \
          $(do-compare) > /dev/null 2>&1; \
          if test $$? -eq 1; then \
            case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* | ./ada/*tools/* ) \
+             gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
                echo warning: $$file differs ;; \
              *) \
                echo $$file differs >> .bad_compare ;; \
@@ -53472,15 +53473,16 @@ compare3:
        : $(MAKE); $(stage); \
        rm -f .bad_compare ; \
        echo Comparing stages 3 and 4 ; \
-       cd stage4-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
+        sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
+       files=`find stage4-* -name "*$(objext)" -print | \
+                sed -n s,^stage$$sed-,,p` ; \
        for file in $${files} ; do \
-         f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
+         f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
+         if test ! -f $$f1; then continue; fi; \
          $(do-compare3) > /dev/null 2>&1; \
          if test $$? -eq 1; then \
            case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* | ./ada/*tools/* ) \
+             gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
                echo warning: $$file differs ;; \
              *) \
                echo $$file differs >> .bad_compare ;; \

diff --git a/Makefile.tpl b/Makefile.tpl
index f49f3fcb2727b147566b94a814235badd91dc1f2..ded52c66eacbcac3facb481f75d8e6941dfc8d44 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1426,15 +1426,16 @@ do-clean: clean-stage[+id+]
        : $(MAKE); $(stage); \
        rm -f .bad_compare ; \
        echo Comparing stages [+prev+] and [+id+] ; \
-       cd stage[+id+]-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
+        sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
+       files=`find stage[+id+]-* -name "*$(objext)" -print | \
+                sed -n s,^stage$$sed-,,p` ; \
        for file in $${files} ; do \
-         f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
+         f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
+         if test ! -f $$f1; then continue; fi; \
          $(do-[+compare-target+]) > /dev/null 2>&1; \
          if test $$? -eq 1; then \
            case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* | ./ada/*tools/* ) \
+             gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
                echo warning: $$file differs ;; \
              *) \
                echo $$file differs >> .bad_compare ;; \