X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=test-build.mk;h=939852bd0a96f9e9a399bf051d35018bb2b891d7;hb=d44b697b7804438f5b1799a2e40dee3efe535174;hp=e5dc1abe5a8aab4ef52f5e4ca865248b83c3d7f3;hpb=04a59f79fb5cc5f974f62d42856086c6b43dc26f;p=deliverable%2Fbinutils-gdb.git

diff --git a/test-build.mk b/test-build.mk
index e5dc1abe5a..939852bd0a 100644
--- a/test-build.mk
+++ b/test-build.mk
@@ -32,16 +32,20 @@ TREE := devo
 
 include $(TREE)/release-info
 
-
-TIME 		:= time
-GCC 		:= $(host)-gcc -O
-GNUC		:= CC="$(GCC)"
+# Set TIME to time to get timings.  Not done by default because time
+# ignores the exit status.
+TIME 		:=
+
+CONFIG_SHELL	:= 
+GCC 		:= $(host)-gcc
+GNUCFLAGS	:= -g -O2
+GNUC		:= CC="$(GCC)" CFLAGS="$(GNUCFLAGS)"
 CFLAGS		:= -g
-CXXFLAGS	:= -g -O
+CXXFLAGS	:= -g -O2
 GNU_MAKE 	:= /usr/latest/bin/make -w 
 MAKEINFOFLAGS	:=
 
-override MAKE 		:= make
+override MAKE 		:= make -w
 override MFLAGS 	:=
 #override MAKEFLAGS 	:=
 
@@ -55,6 +59,18 @@ ifndef target
 target := $(host)
 endif
 
+ifeq ($(patsubst %-lynx,lynx,$(host)),lynx)
+SHELL := /bin/bash
+GNU_MAKE := $(MAKE)
+CONFIG_SHELL 	:= /bin/bash
+endif
+
+ifeq ($(patsubst %-m68k-hp-hpux,m68k-hp-hpux,$(host)),m68k-hp-hpux)
+SHELL := /usr/unsupported/bin/bash
+GNU_MAKE := $(MAKE)
+CONFIG_SHELL 	:= /usr/unsupported/bin/bash
+endif
+
 ifneq ($(build),$(host))
 
 # We are building on a machine other than the host.  We rely upon
@@ -66,28 +82,37 @@ AR		:= $(host)-ar
 AR_FOR_TARGET	:= $(target)-ar
 AS		:= $(host)-as
 AS_FOR_TARGET	:= $(target)-as
+BISON		:= byacc
 CC		:= $(host)-gcc
 CC_FOR_BUILD	:= gcc
 CC_FOR_TARGET	:= $(target)-gcc
-CXX		:= $(host)-c++
-CXX_FOR_TARGET	:= $(target)-c++
-GCC		:= $(host)-gcc -O
+CFLAGS		:= $(GNUCFLAGS)
+CXX		:= $(host)-gcc 
+CXX_FOR_TARGET	:= $(target)-gcc
+GCC		:= $(host)-gcc
 GXX		:= $(host)-g++
 GXX_FOR_TARGET	:= $(target)-g++
 HOST_PREFIX	:= $(build)-
 HOST_PREFIX_1	:= $(build)-
+LEX		:= flex
 MAKEINFO	:= makeinfo
 MUNCH_NM	:= $(host)-nm
 NM		:= $(host)-nm
 NM_FOR_TARGET	:= $(target)-nm
 RANLIB		:= $(host)-ranlib
 RANLIB_FOR_TARGET	:= $(target)-ranlib
+YACC		:= $(BISON)
+
+ifeq ($(host),i386-go32)
+MAKEINFOFLAGS = --no-split
+endif
 
 FLAGS_TO_PASS := \
 	"AR=$(AR)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
 	"AS=$(AS)" \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
+	"BISON=$(BISON)" \
 	"CC=$(CC)" \
 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -98,6 +123,7 @@ FLAGS_TO_PASS := \
 	"GCC=$(GCC)" \
 	"HOST_PREFIX=$(HOST_PREFIX)" \
 	"HOST_PREFIX_1=$(HOST_PREFIX_1)" \
+	"LEX=$(LEX)" \
 	"MAKEINFO=$(MAKEINFO)" \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
 	"MF=$(MF)" \
@@ -107,7 +133,10 @@ FLAGS_TO_PASS := \
 	"RANLIB=$(RANLIB)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
 	"RELEASE_TAG=$(RELEASE_TAG)" \
+	"RUNTEST=$(relbindir)/runtest" \
+	"SHELL=$(SHELL)" \
 	"TIME=$(TIME)" \
+	"YACC=$(YACC)" \
 	"build=$(build)" \
 	"host=$(host)"
 
@@ -127,27 +156,91 @@ FLAGS_TO_PASS := \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
 	"MF=$(MF)" \
 	"host=$(host)" \
-	"RELEASE_TAG=$(RELEASE_TAG)"
+	"RELEASE_TAG=$(RELEASE_TAG)" \
+	"SHELL=$(SHELL)" 
+
+configenv :=
 
-ifneq  '$(CC)' 'cc'
-FLAGS_TO_PASS := "CC=$(CC)" $(FLAGS_TO_PASS)
 endif
 
-configenv :=
+#### we need to change the default C compiler for some hosts
+ifeq ($(host),sparc-sun-solaris2)
+CC := cc -Xs
+endif
 
+ifeq ($(host),mips-sgi-irix4)
+CC := cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000
 endif
 
+ifeq ($(host),hppa1.1-hp-hpux)
+CC := cc -Wp,-H256000
+endif
+
+ifeq ($(host),m68k-hp-hpux)
+CC := cc -Wp,-P,-H256000
+endif
+
+ifeq ($(host),mips-mips-riscos5sysv)
+CC := cc -non_shared -systype sysv
+endif
+
+ifeq ($(host),mips-dec-ultrix)
+CC := cc -Wf,-XNg1000
+endif
+
+ifeq ($(host),m68k-sun-sunos4.1.1)
+CC := cc -J
+endif
+
+# Support gdbtk everywhere
+configargs = --enable-gdbtk
+
+# We want to use stabs for MIPS targets.
+ifeq ($(target),mips-idt-ecoff)
+configargs := $(configargs) --with-stabs
+endif
+
+ifeq ($(target),mips-dec-ultrix)
+configargs := $(configargs) --with-stabs
+endif
+
+ifeq ($(target),mips-sgi-irix4)
+configargs := $(configargs) --with-stabs
+endif
+
+ifeq ($(target),mips-sgi-irix5)
+configargs := $(configargs) --with-stabs
+endif
+
+ifeq ($(patsubst alpha-dec-osf%,alpha,$(target)),alpha)
+configargs := $(configargs) --with-stabs
+endif
+
+# We must use stabs for SVR4 targets.
+ifeq ($(target),i386-sysv4.2)
+configargs := $(configargs) --with-stabs
+endif
+
+ifneq ($(CC), 'cc')
+FLAGS_TO_PASS := "CC=$(CC)" $(FLAGS_TO_PASS)
+endif
+
+#### and on some, we need CONFIG_SHELL
+ifeq ($(patsubst %-lynxos,lynxos,$(host)),lynxos)
+FLAGS_TO_PASS := "CONFIG_SHELL=$(CONFIG_SHELL)" $(FLAGS_TO_PASS)
+endif
 
 # These are the prefixes used for Cygnus builds.
 prefixes	= --prefix=$(release_root) --exec-prefix=$(release_root)/H-$(host)
 
-relbindir	= $(release_root)/H-$(host)/bin
+relbindir	= $(release_root)/H-$(build)/bin
 
 ### general config stuff
 WORKING_DIR 	:= $(host)-objdir
 STAGE1DIR 	:= $(WORKING_DIR).1
 STAGE2DIR 	:= $(WORKING_DIR).2
 STAGE3DIR 	:= $(WORKING_DIR).3
+STAGE4DIR 	:= $(WORKING_DIR).4
 INPLACEDIR 	:= $(host)-in-place
 
 # Arrange to find the needed programs.  If we are building on a
@@ -161,9 +254,9 @@ HOLESDIR 	:= $(holesys)-holes
 BUILD_HOST_HOLES_DIR	:= $(build)-x-$(host)-holes
 BUILD_TARGET_HOLES_DIR	:= $(build)-x-$(target)-holes
 
-SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
-SET_CYGNUS_PATH  := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
-SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
 
 else
 
@@ -171,9 +264,9 @@ holesys		:= $(host)
 HOLESSTAMP	:= $(holesys)-stamp-holes
 HOLESDIR 	:= $(holesys)-holes
 
-SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
-SET_CYGNUS_PATH  := SHELL=sh ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
-SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=$(SHELL) ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
 
 endif
 
@@ -186,6 +279,50 @@ arch 		= $(host)-x-$(target)
 config  	= -host=$(host) -target=$(target)
 FLAGS_TO_PASS	:= $(FLAGS_TO_PASS) "target=$(target)"
 
+ifeq ($(patsubst %-lynx,lynx,$(target)),lynx)
+configargs := $(configargs) --with-headers=/s1/cygnus/dejagnu/$(target)/include \
+                --with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
+ifeq ($(patsubst %-i386-sysv4.2,i386-sysv4.2,$(target)),i386-sysv4.2)
+configargs := $(configargs) --with-headers=/s1/cygnus/dejagnu/$(target)/include \
+                --with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
+ifeq ($(patsubst %-i386-netware,i386-netware,$(target)),i386-netware)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include \
+	--with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
+ifeq ($(patsubst %-sparc-sun-sunos4.1.3,sparc-sun-sunos4.1.3,$(target)),sparc-sun-sunos4.1.3)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include \
+	--with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
+ifeq ($(patsubst %-sparc-sun-solaris2,sparc-sun-solaris2,$(target)),sparc-sun-solaris2)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include \
+	--with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
+ifeq ($(patsubst %-i960-vxworks5.1,i960-vxworks5.1,$(target)),i960-vxworks5.1)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include
+endif
+
+ifeq ($(patsubst %-m68k-vxworks5.1,m68k-vxworks5.1,$(target)),m68k-vxworks5.1)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include
+endif
+
+ifeq ($(patsubst %-i386-unixware,i386-unixware,$(target)),i386-unixware)
+configargs := $(configargs) \
+	--with-headers=/s1/cygnus/dejagnu/$(target)/include \
+	--with-libs=/s1/cygnus/dejagnu/$(target)/lib
+endif
+
 ifneq ($(build),$(host))
 all:	do-cygnus do-latest
 build-all: build-cygnus build-latest
@@ -194,15 +331,6 @@ all:	do-native do-latest
 build-all: build-native build-latest
 endif
 
-ifeq ($(target),mips-idt-ecoff)
-configargs	:= $(configargs) -with-gnu-as -with-stabs
-endif
-
-ifeq ($(host),i386-go32)
-ifeq ($(subst mips-idt-ecoff,sparclite-aout,$(target)),sparclite-aout)
-configargs	:= $(configargs) -with-gnu-ld
-endif
-endif
 
 else
 ##
@@ -217,25 +345,67 @@ all:	$(host)-stamp-3stage-done
 endif
 #all:	in-place do1 do2 do3 comparison
 
-ifeq ($(subst mips-sgi-irix4,mips-dec-ultrix,$(host)),mips-dec-ultrix)
-configargs	:= $(configargs) -with-gnu-as -with-stabs
 endif
 
-endif
-
-ifeq ($(target),m68k-hp-hpux)
-configargs	:= $(configargs) -with-gnu-as
-endif
-
-
 NATIVEDIR	:= $(arch)-native-objdir
 CYGNUSDIR	:= $(arch)-cygnus-objdir
 LATESTDIR	:= $(arch)-latest-objdir
-
+DOSDIR		:= dos-x-$(target)-objdir
 
 everything: 	 do-cross 
 #everything: 	in-place do1 do2 do3 comparison do-cygnus 
 
+.PHONY: dos
+dos:
+	$(MAKE) -f test-build.mk CFLAGS= build=$(host) host=i386-go32 target=$(target) do-dos
+dos-path:
+	$(MAKE) -f test-build.mk CFLAGS= build=$(host) host=i386-go32 target=$(target) path-dos
+
+.PHONY: do-dos
+do-dos: $(HOLESSTAMP) dos-x-$(target)-stamp-done
+build-dos: $(HOLESSTAMP) dos-x-$(target)-stamp-dos-checked
+config-dos: $(HOLESSTAMP) dos-x-$(target)-stamp-dos-configured
+path-dos:
+	@echo "$(SET_CYGNUS_PATH)"
+
+dos-x-$(target)-stamp-done: 
+	[ -f $(relbindir)/$(host)-gcc ] || (echo "must have gcc available"; exit 1)
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) -f test-build.mk dos-x-$(target)-stamp-installed  $(FLAGS_TO_PASS)
+	if [ -f CLEAN_ALL -o -f CLEAN_CROSSES ] ; then rm -rf $(DOSDIR) ; else true ; fi
+	touch $@
+
+dos-x-$(target)-stamp-installed: $(HOLESSTAMP) dos-x-$(target)-stamp-intermediate
+	[ -d dos-x-$(target)-installed ] || mkdir dos-x-$(target)-installed
+	$(SET_CYGNUS_PATH) $(TREE)/release/mkdosrel dos-x-$(target)-intermediate \
+	  dos-x-$(target)-installed $(target)
+#	(cd dos-x-$(target)-installed; find . -print | $(TREE)/release/make8.3)
+	touch $@
+
+dos-x-$(target)-stamp-intermediate:  $(HOLESSTAMP) dos-x-$(target)-stamp-dos-checked
+	[ -d dos-x-$(target)-intermediate ] || mkdir dos-x-$(target)-intermediate
+	dir=`pwd` ; export dir ; \
+	$(SET_CYGNUS_PATH) cd $(DOSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) \
+	  prefix=$$dir/dos-x-$(target)-intermediate install install-info 
+	touch $@
+
+dos-x-$(target)-stamp-dos-checked: $(HOLESSTAMP) dos-x-$(target)-stamp-dos-built
+#	cd $(DOSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) check 
+	touch $@
+
+dos-x-$(target)-stamp-dos-built:  $(HOLESSTAMP) dos-x-$(target)-stamp-dos-configured
+	$(SET_CYGNUS_PATH) cd $(DOSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) all info
+	touch $@
+
+dos-x-$(target)-stamp-dos-configured:  $(HOLESSTAMP)
+	[ -d $(DOSDIR) ] || mkdir $(DOSDIR)
+	$(SET_CYGNUS_PATH) cd $(DOSDIR) ; $(GNUC) $(configenv) $(TIME) $(CONFIG_SHELL) \
+	  ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) --prefix=/cygnus \
+	  --program-transform-name='' $(configargs)
+	touch $@
+
+
+
+
 .PHONY: do-native
 do-native: $(HOLESSTAMP) $(arch)-stamp-native
 do-native-config: $(arch)-stamp-native-configured
@@ -244,7 +414,7 @@ config-native: $(HOLESSTAMP) $(arch)-stamp-native-configured
 
 $(arch)-stamp-native: $(HOLESSTAMP)
 	$(SET_NATIVE_HOLES) $(TIME) $(GNU_MAKE) -f test-build.mk  $(arch)-stamp-native-installed $(FLAGS_TO_PASS) 
-	if [ -f CLEAN_ALL ] ; then rm -rf $(NATIVEDIR) ; else true ; fi
+	if [ -f CLEAN_ALL -o -f CLEAN_CROSSES ] ; then rm -rf $(NATIVEDIR) ; else true ; fi
 	touch $(arch)-stamp-native
 
 $(arch)-stamp-native-installed: $(HOLESSTAMP) $(arch)-stamp-native-checked
@@ -263,7 +433,7 @@ $(arch)-stamp-native-built: $(HOLESSTAMP) $(arch)-stamp-native-configured
 
 $(arch)-stamp-native-configured: $(HOLESSTAMP)
 	[ -d $(NATIVEDIR) ] || mkdir $(NATIVEDIR)
-	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(configenv) CC="$(CC)" $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 
@@ -271,6 +441,8 @@ $(arch)-stamp-native-configured: $(HOLESSTAMP)
 do-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus
 build-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-checked
 config-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-configured
+path-cygnus:
+	$(SET_CYGNUS_PATH) echo $$PATH
 
 vault-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-built
 	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install 
@@ -279,12 +451,15 @@ vault-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-built
 $(arch)-stamp-cygnus: 
 	[ -f $(relbindir)/$(host)-gcc ] || (echo "must have gcc available"; exit 1)
 	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) -f test-build.mk $(arch)-stamp-cygnus-installed  $(FLAGS_TO_PASS)
-	if [ -f CLEAN_ALL ] ; then rm -rf $(CYGNUSDIR) ; else true ; fi
+	if [ -f CLEAN_ALL -o -f CLEAN_CROSSES ] ; then rm -rf $(CYGNUSDIR) ; else true ; fi
 	touch $(arch)-stamp-cygnus
 
 $(arch)-stamp-cygnus-installed:  $(HOLESSTAMP) $(arch)-stamp-cygnus-checked
 	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install 
 	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install-info
+	if [ -f VAULT-INSTALL ] ; then \
+	  $(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install ; \
+	else true ; fi
 	touch $@
 
 $(arch)-stamp-cygnus-checked: $(HOLESSTAMP) $(arch)-stamp-cygnus-built
@@ -298,7 +473,7 @@ $(arch)-stamp-cygnus-built:  $(HOLESSTAMP) $(arch)-stamp-cygnus-configured
 
 $(arch)-stamp-cygnus-configured:  $(HOLESSTAMP)
 	[ -d $(CYGNUSDIR) ] || mkdir $(CYGNUSDIR)
-	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(GNUC) $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(configenv) $(GNUC) $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do-latest
@@ -325,7 +500,7 @@ $(arch)-stamp-latest-built: $(arch)-stamp-latest-configured
 
 $(arch)-stamp-latest-configured:
 	[ -d $(LATESTDIR) ] || mkdir $(LATESTDIR)
-	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(GNUC) $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(configenv) $(GNUC) $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 
@@ -359,7 +534,7 @@ $(host)-stamp-in-place-built: $(host)-stamp-in-place-configured
 	touch $@
 
 $(host)-stamp-in-place-configured: $(host)-stamp-in-place-cp
-	cd $(INPLACEDIR) ; $(configenv) $(TIME) ./configure $(config) -v $(prefixes) $(configargs)
+	cd $(INPLACEDIR) ; $(configenv) CC="$(CC)" $(TIME) $(CONFIG_SHELL) ./configure $(config) -v $(prefixes) $(configargs)
 	touch $@
 
 $(host)-stamp-in-place-cp:
@@ -403,6 +578,9 @@ $(host)-stamp-stage1-installed: $(host)-stamp-stage1-checked
 	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" install-info host=$(host)
 ifeq ($(host),rs6000-ibm-aix)
 	-rm $(relbindir)/make
+endif
+ifeq ($(host),rs6000-ibm-aix3.2.5)
+	-rm $(relbindir)/make
 endif
 	touch $@
 
@@ -418,7 +596,7 @@ $(host)-stamp-stage1-built: $(host)-stamp-stage1-configured
 $(host)-stamp-stage1-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; \
-	  $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	  $(configenv) CC="$(CC)" $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do2
@@ -426,9 +604,9 @@ do2:	$(HOLESDIR) $(host)-stamp-stage2
 
 do2-vault: $(HOLESSTAMP) $(host)-stamp-stage2-built
 	if [ -d $(WORKING_DIR).2 ] ; then \
-	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).2 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).2 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \
 	else \
-	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \
 	fi
 
 
@@ -444,24 +622,29 @@ $(host)-stamp-stage2:
 	touch $@
 
 
+# The SunOS make program gets confused when it is deleted while running.
+# The signal handlers return to the wrong place, or something, and the
+# program dumps core.  To avoid trouble with installing make over itself,
+# we delete the installed make program.
 $(host)-stamp-stage2-installed: $(host)-stamp-stage2-checked
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install host=$(host)
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install-info host=$(host)
+	-rm -f $(relbindir)/make
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(GNU_MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-checked: $(host)-stamp-stage2-built
-#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host)
+#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-built: $(host)-stamp-stage2-configured
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" all host=$(host)
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" info host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
-	  $(configenv) $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	  $(configenv) $(GNUC) $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do3
@@ -469,9 +652,9 @@ do3:	$(HOLESDIR) $(host)-stamp-stage3
 
 do3-vault: $(HOLESSTAMP) $(host)-stamp-stage3-built
 	if [ -d $(WORKING_DIR).3 ] ; then \
-	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).3 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).3 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \
 	else \
-	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \
 	fi
 
 $(host)-stamp-stage3:
@@ -480,29 +663,75 @@ $(host)-stamp-stage3:
 	else \
 		true ; \
 	fi
-	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) $(FLAGS_TO_PASS) -f test-build.mk -w $(host)-stamp-stage3-checked 
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) $(FLAGS_TO_PASS) -f test-build.mk -w $(host)-stamp-stage3-installed
 	mv $(WORKING_DIR) $(STAGE3DIR) 
 	touch $@
 
 
+# The SunOS make program gets confused when it is deleted while running.
+# The signal handlers return to the wrong place, or something, and the
+# program dumps core.  To avoid trouble with installing make over itself,
+# we delete the installed make program.
 $(host)-stamp-stage3-installed: $(host)-stamp-stage3-checked
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install host=$(host)
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install-info host=$(host)
+	-rm -f $(relbindir)/make
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(GNU_MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host)
+	if [ -f VAULT-INSTALL ] ; then \
+	  $(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install ; \
+	else true ; fi
 	touch $@
 
 $(host)-stamp-stage3-checked: $(host)-stamp-stage3-built
-#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host)
+#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host)
+	touch $@
+
+$(host)-check-3stage: $(host)-stamp-stage3
+	$(SET_CYGNUS_PATH) cd $(STAGE3DIR) ; $(TIME) $(MAKE) -k -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host)
 	touch $@
 
 $(host)-stamp-stage3-built: $(host)-stamp-stage3-configured
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" all host=$(host)
-	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" info host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host)
 	touch $@
 
 $(host)-stamp-stage3-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
-	  $(configenv) $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	  $(configenv) $(GNUC) $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	touch $@
+
+.PHONY: do4
+do4:	$(HOLESDIR) $(host)-stamp-stage4
+
+$(host)-stamp-stage4:
+	if [ -d $(STAGE4DIR) ] ; then \
+		mv $(STAGE4DIR) $(WORKING_DIR) ; \
+	else \
+		true ; \
+	fi
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) $(FLAGS_TO_PASS) -f test-build.mk -w $(host)-stamp-stage4-checked 
+	mv $(WORKING_DIR) $(STAGE4DIR) 
+	touch $@
+
+
+$(host)-stamp-stage4-installed: $(host)-stamp-stage4-checked
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host)
+	touch $@
+
+$(host)-stamp-stage4-checked: $(host)-stamp-stage4-built
+#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host)
+	touch $@
+
+$(host)-stamp-stage4-built: $(host)-stamp-stage4-configured
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host)
+	touch $@
+
+$(host)-stamp-stage4-configured:
+	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
+	  $(configenv) $(GNUC) $(TIME) $(CONFIG_SHELL) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 # These things are needed by a three-stage, but are not included locally.
@@ -548,7 +777,9 @@ HOLES := \
 	rmdir \
 	sed \
 	sh \
+	sleep \
 	sort \
+	tail \
 	tar \
 	test \
 	time \
@@ -557,6 +788,7 @@ HOLES := \
 	true \
 	uname \
 	uniq \
+	uptime \
 	uudecode \
 	wc \
 	whoami
@@ -570,16 +802,37 @@ endif
 
 ### solaris 2 -- don't use /usr/ucb/cc
 ifeq (sparc-sun-solaris2,$(holesys))
-SET_NATIVE_HOLES := SHELL=sh ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
 HOLE_DIRS := /usr/ccs/bin
 CC_HOLE :=
 NUKEM := cc 
 endif
 
+ifeq ($(host),i386-go32)
+DOS_HOLES := aout2exe doschk file
+endif
+
+ifeq ($(host),i386-lynx)
+MAKE_HOLE := make
+endif
+
+ifeq ($(host),m68k-lynx)
+MAKE_HOLE := make
+endif
+
+ifeq ($(host),sparc-lynx)
+MAKE_HOLE := make
+endif
+
+ifeq ($(host),rs6000-lynx)
+MAKE_HOLE := make
+endif
+
 ### These things are also needed by a three-stage, but in this case, the GNU version of the tool is required.
 PARTIAL_HOLES := \
 	$(MAKE_HOLE) \
 	$(CC_HOLE) \
+	$(DOS_HOLES) \
 	flex \
 	m4
 
@@ -589,6 +842,7 @@ HOLE_DIRS := \
 	/bin \
 	/usr/bin \
 	/usr/ucb \
+	/etc /usr/etc \
 	/usr/unsupported/bin
 
 ### look in these directories for alternate versions of some tools.
@@ -597,7 +851,8 @@ PARTIAL_HOLE_DIRS := \
 	/usr/progressive/bin \
 	$(PARTIAL_HOLE_DIRS) \
 	/usr/vintage/bin \
-	/usr/unsupported/bin
+	/usr/unsupported/bin \
+	$(HOLE_DIRS)
 
 $(HOLESDIR): $(holesys)-stamp-holes
 
@@ -724,10 +979,11 @@ endif
 
 .PHONY: comparison
 comparison: $(host)-stamp-3stage-compared
+comparison-stage3to4: $(host)-stamp-4stage-compared
 
 $(host)-stamp-3stage-compared:
 	rm -f .bad-compare
-ifeq ($(subst i386-sco3.2v4,mips-sgi-irix4,$(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host)))),mips-sgi-irix4)
+ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(subst i386-sco3.2v4,mips-sgi-irix4,$(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host))))),mips-sgi-irix4)
 	for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
 		tail +10c $(STAGE2DIR)/$$i > foo1 ; \
 		tail +10c $(STAGE3DIR)/$$i > foo2 ; \
@@ -758,6 +1014,38 @@ endif
 	fi
 	touch $@	
 
+$(host)-stamp-4stage-compared:
+	rm -f .bad-compare
+ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(subst i386-sco3.2v4,mips-sgi-irix4,$(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host))))),mips-sgi-irix4)
+	for i in `cd $(STAGE4DIR) ; find . -name \*.o -print` ; do \
+		tail +10c $(STAGE3DIR)/$$i > foo1 ; \
+		tail +10c $(STAGE4DIR)/$$i > foo2 ; \
+		if cmp foo1 foo2 ; then \
+			true ; \
+		else \
+			echo $$i ; \
+			touch .bad-compare ; \
+		fi ; \
+	done
+	rm -f foo1 foo2
+else
+	for i in `cd $(STAGE4DIR) ; find . -name \*.o -print` ; do \
+		cmp $(STAGE3DIR)/$$i $(STAGE4DIR)/$$i || touch .bad-compare ; \
+	done
+endif
+	if [ -f CLEAN_ALL ] ; then \
+	  rm -rf $(STAGE2DIR) $(STAGE3DIR) $(STAGE4DIR) ; \
+	else \
+	  if [ -f CLEAN_STAGES ] ; then \
+	    if [ -f .bad-compare ] ; then \
+	      true ; \
+	    else \
+	      rm -rf $(STAGE1DIR) $(STAGE2DIR) $(STAGE3DIR) ; \
+	    fi ; \
+  	  else true ; \
+  	  fi ; \
+  	fi
+
 .PHONY: clean
 clean:
 	rm -rf $(HOLESDIR) $(INPLACEDIR) $(WORKING_DIR)* $(host)-stamp-* *~