* Makefile.in (comparison): When comparing as.new or gasp.new, try running the

binary through sed to avoid differences due to "stage1" or "stage2" having been
written into the binary.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5adda6313e9524adf44b00c7a1f15e16586ca2b8..b783e2678f41e4dc89e84af2c511faa60c6d77b0 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 11 15:05:11 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+       * Makefile.in (comparison): When comparing as.new or gasp.new, try
+       running the binary through sed to avoid differences due to
+       "stage1" or "stage2" having been written into the binary.
+
 Sat Oct  8 01:48:04 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
 
        ELF symbol size handling, based on code from Eric Youngdale:

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 013f4b6e0a4ee954411c857fbb8ad380ea195834..b9a33953cec13c4c5fc1ce7a6e25dbfc5240d8a8 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -63,6 +63,8 @@ INSTALL_DATA = $(INSTALL)
 INSTALL_XFORM = $(INSTALL) -t='-e "$(program_transform_name)"'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
+DISTSTUFF= make-gas.com
+
 AR = ar
 AR_FLAGS = qv
 BISON = bison
@@ -434,13 +436,12 @@ doc: $(srcdir)/as.info
 $(srcdir)/as.info: $(srcdir)/doc/as.texinfo
        @(cd doc; $(MAKE) $(FLAGS_TO_PASS) as.info; mv as.info $srcdir) 
 
-diststuff: make-gas.com
+diststuff: $(DISTSTUFF)
 
 clean-here:
        -rm -f $(STAGESTUFF) core
 
 clean mostlyclean: clean-here
-       -rm -f make-gas.com
        @cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
        @if [ -d testsuite ] ; then \
          cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) $@ ; \
@@ -456,6 +457,7 @@ distclean: clean-here
                targ-cpu.c obj-format.h obj-format.c atof-targ.c TAGS \
                config-stamp config.h conf config.log config.cache
 realclean: clean distclean
+       -rm -rf $(DISTSTUFF)
 
 # Entry points `install', `includes' and `uninstall'.
 
@@ -529,8 +531,20 @@ stage3: force
 
 against=stage2
 
+COMPARE_SED= 's/stage./stageX/g'
 comparison: force
-       for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
+       for i in *.o ; do cmp $$i $(against)/$$i ; done
+       -rm -f x0-* x1-*
+       for i in as.new gasp.new ; do \
+         sed $(COMPARE_SED) < $$i > x0-$$i ; \
+         sed $(COMPARE_SED) < $(against)/$$i > x1-$$i ; \
+         if cmp x0-$$i x1-$$i ; then \
+           echo $$i match ; \
+         else \
+           echo $$i differs ; exit 1 ; \
+         fi ; \
+       done
+       -rm -f x0-* x1-*
 
 de-stage1: force
        - (cd stage1 ; rm -f as ; mv -f * ..)