* Makefile.in (bootstrap, bootstrap2, bootstrap3): Create a "stage" symlink to

the appropriate stage* directory, and use it instead in the -B options.
(comparison): Revert yesterday's change.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2ba2299cdf2b7de96e5274fd9390673091c92b86..7854ef3cbad4e57adecfad551c268e6a91a1774e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 12 01:41:37 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+       * Makefile.in (bootstrap, bootstrap2, bootstrap3): Create a
+       "stage" symlink to the appropriate stage* directory, and use it
+       instead in the -B options.
+       (comparison): Revert yesterday's change.
+
 Tue Oct 11 16:48:11 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
        * config/tc-sparc.c (tc_gen_reloc): For non-a.out relocations, if

diff --git a/gas/Makefile.in b/gas/Makefile.in
index b9a33953cec13c4c5fc1ce7a6e25dbfc5240d8a8..52a9c7735f37c01151303c17e8581a342963517e 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -498,19 +498,24 @@ tags TAGS: force
 
 bootstrap: as.new force
        $(MAKE) stage1
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
+       rm -f stage && ln -s stage1 stage
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) stage2
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
+       rm -f stage && ln -s stage2 stage
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 bootstrap2: force
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
+       rm -f stage && ln -s stage1 stage
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) stage2
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
+       rm -f stage && ln -s stage2 stage
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 bootstrap3: force
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
+       rm -f stage && ln -s stage2 stage
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 # Copy the object files from a particular stage into a subdirectory.
@@ -531,20 +536,8 @@ stage3: force
 
 against=stage2
 
-COMPARE_SED= 's/stage./stageX/g'
 comparison: force
-       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-*
+       for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
 
 de-stage1: force
        - (cd stage1 ; rm -f as ; mv -f * ..)