added support for binary comparisons.

This commit is contained in:
K. Richard Pixley
1991-06-09 20:27:20 +00:00
parent 30ba1dfeaf
commit a01bf1fbc1
4 changed files with 48 additions and 38 deletions

View File

@ -1,7 +1,7 @@
# #
# Makefile for directory with subdirs to build. # Makefile for directory with subdirs to build.
# #
# Last Mod Mon May 27 15:55:09 PDT 1991, by rich@cygint.cygnus.com # Last Mod Fri May 31 10:35:51 PDT 1991, by rich@cygint.cygnus.com
# #
# $Id$ # $Id$
@ -26,21 +26,18 @@ all:
$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)" $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
subdir_do: force subdir_do: force
for i in $(DODIRS); \ for i in $(DODIRS); do \
do \ if [ -d $(srcdir)/$$i -o -d $(srcdir)/$$i.$(target) ] ; then \
if [ -d $(srcdir)/$$i -o -d $(srcdir)/$$i.$(target) ] ; then \ if (cd $(srcdir)/$$i`if [ -d $(srcdir)/$$i.$(target) ] ; \
if (cd $(srcdir)/$$i`if [ -d $(srcdir)/$$i.$(target) ] ; \ then echo .$(target) ; fi`$(subdir); \
then echo .$(target) ; fi`$(subdir); \ $(MAKE) \
$(MAKE) \ "against=$(against)" \
"destdir=$(destdir)" \ "AR=$(AR)" \
"AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \
"AR_FLAGS=$(AR_FLAGS)" \ "RANLIB=$(RANLIB)" $(DO)) ; then true ; \
"RANLIB=$(RANLIB)" $(DO)) ; \ else exit 1 ; fi ; \
then true ; \ else true ; fi ; \
else exit 1 ; \ done
fi ;\
else true; fi ; \
done
bootstrap: bootstrap:
$(MAKE) all $(MAKE) all
@ -48,14 +45,17 @@ bootstrap:
$(MAKE) pass "stagepass=stage1" $(MAKE) pass "stagepass=stage1"
$(MAKE) stage2 $(MAKE) stage2
$(MAKE) pass "stagepass=stage2" $(MAKE) pass "stagepass=stage2"
$(MAKE) comparison
bootstrap2: bootstrap2:
$(MAKE) pass "stagepass=stage1" $(MAKE) pass "stagepass=stage1"
$(MAKE) stage2 $(MAKE) stage2
$(MAKE) pass "stagepass=stage2" $(MAKE) pass "stagepass=stage2"
$(MAKE) comparison
bootstrap3: bootstrap3:
$(MAKE) pass "stagepass=stage2" $(MAKE) pass "stagepass=stage2"
$(MAKE) comparison
pass: pass:
cp $(srcdir)/gcc`if [ -d $(srcdir)/gcc.$(target) ] ; \ cp $(srcdir)/gcc`if [ -d $(srcdir)/gcc.$(target) ] ; \
@ -90,6 +90,10 @@ stage3:
stage4: stage4:
$(MAKE) subdir_do DO=stage4 "DODIRS=$(SUBDIRS)" $(MAKE) subdir_do DO=stage4 "DODIRS=$(SUBDIRS)"
against=stage2
comparison:; $(MAKE) subdir_do DO=comparison against=$(against) "DODIRS=$(SUBDIRS)"
de-stage1:; $(MAKE) subdir_do DO=de-stage1 "DODIRS=$(SUBDIRS)" de-stage1:; $(MAKE) subdir_do DO=de-stage1 "DODIRS=$(SUBDIRS)"
de-stage2:; $(MAKE) subdir_do DO=de-stage2 "DODIRS=$(SUBDIRS)" de-stage2:; $(MAKE) subdir_do DO=de-stage2 "DODIRS=$(SUBDIRS)"
de-stage3:; $(MAKE) subdir_do DO=de-stage3 "DODIRS=$(SUBDIRS)" de-stage3:; $(MAKE) subdir_do DO=de-stage3 "DODIRS=$(SUBDIRS)"
@ -132,7 +136,10 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
# #
# $Log$ # $Log$
# Revision 1.14 1991/05/31 12:34:55 gnu # Revision 1.15 1991/06/09 20:27:01 rich
# added support for binary comparisons.
#
# Revision 1.14 1991/05/31 12:34:55 gnu
# Avoid error stop from Make if a directory doesn't exist during subdir_do. # Avoid error stop from Make if a directory doesn't exist during subdir_do.
# #
# Revision 1.13 1991/05/27 23:03:20 rich # Revision 1.13 1991/05/27 23:03:20 rich

View File

@ -72,6 +72,11 @@ stage3: force
- mkdir stage3 - mkdir stage3
- mv -f $(STAGESTUFF) stage3 - mv -f $(STAGESTUFF) stage3
against=stage2
comparison: force
for i in *.o ; do cmp $$i $(against)/$$i || exit 1 ; done
de-stage1: force de-stage1: force
- (cd stage1 ; mv -f $(STAGESTUFF) ..) - (cd stage1 ; mv -f $(STAGESTUFF) ..)
- rmdir stage1 - rmdir stage1

View File

@ -33,6 +33,7 @@ NM_PROG=nm
OBJDUMP_PROG=objdump OBJDUMP_PROG=objdump
PROGS = $(SIZE_PROG) $(COPY_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_PROG) $(RANLIB_PROG) PROGS = $(SIZE_PROG) $(COPY_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_PROG) $(RANLIB_PROG)
STAGESTUFF = $(PROGS) *.o
BASEDIR = $(srcdir)/.. BASEDIR = $(srcdir)/..
LIBDIR = $(srcdir)/../bfd$(subdir) LIBDIR = $(srcdir)/../bfd$(subdir)
@ -104,15 +105,20 @@ $(STRIP_PROG): $(COPY_PROG)
stage1: force stage1: force
- mkdir stage1 - mkdir stage1
- mv -f *.o $(PROGS) stage1 - mv -f $(STAGESTUFF) stage1
stage2: force stage2: force
- mkdir stage2 - mkdir stage2
- mv -f *.o $(PROGS) stage2 - mv -f $(STAGESTUFF) stage2
stage3: force stage3: force
- mkdir stage3 - mkdir stage3
- mv -f *.o $(PROGS) stage3 - mv -f $(STAGESTUFF) stage3
against=stage2
comparison: force
for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
de-stage1: force de-stage1: force
- (cd stage1 ; mv -f * ..) - (cd stage1 ; mv -f * ..)
@ -127,7 +133,7 @@ de-stage3: force
- rmdir stage3 - rmdir stage3
clean: clean:
-rm -f *.o *~ \#* core $(PROGS) TAGS -rm -f *.o *~ \#* core $(STAGESTUFF) TAGS
etags tags: TAGS etags tags: TAGS
@ -135,7 +141,7 @@ TAGS: force
etags $(INCDIR)/*.h $(BFDSRC)/*.[hc] *.[hc] etags $(INCDIR)/*.h $(BFDSRC)/*.[hc] *.[hc]
realclean: clean realclean: clean
-rm -f $(PROGS) TAGS -rm -f $(STAGESTUFF) TAGS
install: $(PROGS) install: $(PROGS)
for i in $(PROGS) ; do \ for i in $(PROGS) ; do \
@ -148,10 +154,8 @@ size.o: size.c
copy.o: copy.c copy.o: copy.c
objdump.o: objdump.c objdump.o: objdump.c
m68k-pinsn.o: m68k-pinsn.c m68k-pinsn.o: m68k-pinsn.c
m68k-pinsn.o: ./m68k-opcode.h
i960-pinsn.o: i960-pinsn.c i960-pinsn.o: i960-pinsn.c
sparc-pinsn.o: sparc-pinsn.c sparc-pinsn.o: sparc-pinsn.c
sparc-pinsn.o: ./sparc-opcode.h
nm.o: nm.c nm.o: nm.c
ar.o: ar.c ar.o: ar.c
getopt.o:getopt.c getopt.o:getopt.c

View File

@ -488,17 +488,17 @@ bootstrap: as force
$(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as
$(MAKE) stage2 $(MAKE) stage2
$(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as
$(MAKE) stage-last $(MAKE) comparison against=stage2
bootstrap2: force bootstrap2: force
$(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as
$(MAKE) stage2 $(MAKE) stage2
$(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as
$(MAKE) stage-last $(MAKE) comparison against-stage2
bootstrap3: force bootstrap3: force
$(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as
$(MAKE) stage-last $(MAKE) comparison against=stage2
# Copy the object files from a particular stage into a subdirectory. # Copy the object files from a particular stage into a subdirectory.
stage1: force stage1: force
@ -513,6 +513,11 @@ stage3: force
-mkdir stage3 -mkdir stage3
-mv $(STAGESTUFF) stage3 -mv $(STAGESTUFF) stage3
against=stage2
comparison: force
for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
de-stage1: force de-stage1: force
- (cd stage1 ; mv -f * ..) - (cd stage1 ; mv -f * ..)
- rmdir stage1 - rmdir stage1
@ -525,9 +530,6 @@ de-stage3: force
- (cd stage3 ; mv -f * ..) - (cd stage3 ; mv -f * ..)
- rmdir stage3 - rmdir stage3
stage-last:
for i in *.o; do cmp $$i stage2/$$i; done
# Copy just the executable files from a particular stage into a subdirectory, # Copy just the executable files from a particular stage into a subdirectory,
# and delete the object files. Use this if you're just verifying a version # and delete the object files. Use this if you're just verifying a version
# that is pretty sure to work, and you are short of disk space. # that is pretty sure to work, and you are short of disk space.
@ -563,14 +565,6 @@ risky-stage4: force
.PHONY: stage1 stage2 stage3 stage4 clean realclean TAGS bootstrap .PHONY: stage1 stage2 stage3 stage4 clean realclean TAGS bootstrap
.PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4 .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4
comparison: clean
$(MAKE) "CC=/usr/local/bin/gcc -Wall" as
$(MAKE) stage1
- $(MAKE) "CC=/usr/local/bin/gcc -Wall -b$(target) -Bstage1/" as -k
$(MAKE) stage2
- $(MAKE) "CC=/usr/local/bin/gcc -Wall -b$(target)" as -k
$(MAKE) stage-last
force: force:
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure Makefile: $(srcdir)/Makefile.in $(srcdir)/configure