diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 22 | ||||
-rw-r--r-- | Makefile.tpl | 11 |
3 files changed, 24 insertions, 15 deletions
@@ -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-05-28 Doug Kwan <dougkwan@google.com> * configure.ac: Support gold for target arm*-*-*. diff --git a/Makefile.in b/Makefile.in index aa34c89..6546a33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52210,15 +52210,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/* ) \ + gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \ echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ @@ -52535,15 +52536,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/* ) \ + 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 e683ebc..5eb377e 100644 --- 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/* ) \ + gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \ echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ |