--- gforth/Makefile.in	2007/12/31 18:40:23	1.372
+++ gforth/Makefile.in	2008/01/02 21:04:44	1.374
@@ -66,6 +66,7 @@ INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 M4      = @M4@
 GCC	= @CC@
+BOOTFORTH	= @GFORTH@
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
@@ -112,6 +113,7 @@ XLDFLAGS = @LDFLAGS@
 LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS	= @LIBS@
 
+STACK_CACHE_REGS = @STACK_CACHE_REGS@
 STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
 
 # ------------	Install Directories
@@ -443,6 +445,10 @@ KERN_DEPS = $(KERN_SRC) kernel/version.f
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
 	  doc/vmgen.info doc/vmgen.ps
 
+BKERNLS = kernl16b$(EC).fi kernl16l$(EC).fi \
+	  kernl32b$(EC).fi kernl32l$(EC).fi \
+	  kernl64b$(EC).fi kernl64l$(EC).fi
+
 KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \
 	 kernl32b$(EC).fi- kernl32l$(EC).fi- \
 	 kernl64b$(EC).fi- kernl64l$(EC).fi-
@@ -677,6 +683,11 @@ all-bench allbench:	gforth-fast$(EC)$(EX
 	./gforth-itc onebench.fs
 	./gforth-ditc onebench.fs
 
+# ------------- Bootstrapping
+bootstrap:
+	[ ! -z "${BOOTFORTH}" ] && \
+	${MAKE} BUILDFORTH="${BOOTFORTH}" FORTHP="${BOOTFORTH}" engine/prim.i ${BKERNLS}
+
 # -------------	Make forth images
 
 # How to make new images:
@@ -753,8 +764,8 @@ prim.b:		prim cache0.vmg
 		$(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in
-		$(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@
+prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg cache-regs$(STACK_CACHE_REGS).vmg peeprules.vmg Makefile
+		$(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -DSTACK_CACHE_REGS=cache-regs$(STACK_CACHE_REGS).vmg $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs