diff options
| author | Jeffrey A Law <law@cygnus.com> | 1999-02-24 13:49:13 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-02-24 06:49:13 -0700 |
| commit | 671705c04c85484f968ad2e057b46823faeca5ff (patch) | |
| tree | 14fd712b50c303567e8faaf0ae32e30342105359 | |
| parent | bbc4fb5fd19d14386c19d6e2b66e0012fe6cf8e4 (diff) | |
| download | gcc-671705c04c85484f968ad2e057b46823faeca5ff.tar.gz | |
Makefile.in (compare, gnucompare): Ignore comparison failures for some objects in the ObjC runtime.
* Makefile.in (compare, gnucompare): Ignore comparison failures
for some objects in the ObjC runtime.
From-SVN: r25404
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/Makefile.in | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e4c93a881a6..d9adce160b1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -2,6 +2,9 @@ Wed Feb 24 03:17:56 1999 Jeffrey A Law (law@cygnus.com) * version.c: Bump for prerelease. + * Makefile.in (compare, gnucompare): Ignore comparison failures + for some objects in the ObjC runtime. + Wed Feb 24 02:39:08 1999 Jeffrey A Law (law@cygnus.com) Mon Dec 7 16:15:51 1998 J"orn Rennecke <amylaar@cygnus.co.uk> diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 8d301cb98c4..3992f529b97 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2746,9 +2746,11 @@ compare compare3 compare4 compare-lean compare3-lean compare4-lean: force for dir in tmp-foo $(SUBDIRS); do \ if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \ for file in $$dir/*$(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; \ + if [ $$file != objc/NXConstStr.o -a $$file != objc/Object.o -a $$file != objc/Protocol.o ] ; then \ + 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; \ + else true; fi; \ done; \ fi; \ done @@ -2779,7 +2781,9 @@ gnucompare gnucompare3 gnucompare4 gnucompare-lean gnucompare3-lean gnucompare4- for dir in tmp-foo $(SUBDIRS); do \ if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \ for file in $$dir/*$(objext); do \ - (cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \ + if [ $$file != objc/NXConstStr.o -a $$file != objc/Object.o -a $$file != objc/Protocol.o ] ; then \ + (cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \ + else true; fi; \ done; \ fi; \ done |