Makefile.in (compare, gnucompare): Ignore comparison failures for some objects in...

        * Makefile.in (compare, gnucompare): Ignore comparison failures
        for some objects in the ObjC runtime.

From-SVN: r25404

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4c93a881a682f1f1e72d04dc89254713785dbbd..d9adce160b170c682aa1bf8d4c8c190a65411c7b 100644 (file)
--- 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 8d301cb98c4a5da44e8b3e83b3c69bb31dcc07b7..3992f529b97001fd5a4b9dfa79c0dd96759ec823 100644 (file)
--- 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