Bump bootstrap stuff from op-make. Mostly from fries@

2 files changed, 42 insertions, 23 deletions

diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot
index 4ab8d5791b9..ce5882de84e 100644
--- a/usr.bin/make/Makefile.boot
+++ b/usr.bin/make/Makefile.boot
@@ -1,4 +1,5 @@
-#	$OpenBSD: Makefile.boot,v 1.6 1998/12/05 00:06:26 espie Exp $
+#	$OpenPackages: Makefile.boot,v 1.5 2001/04/06 00:09:55 will Exp $
+#	$OpenBSD: Makefile.boot,v 1.7 2001/05/03 14:06:19 espie Exp $
 #
 # a very simple makefile...
 #
@@ -12,29 +13,47 @@
 
 MACHINE=sun
 MACHINE_ARCH=sparc
-CFLAGS= -I. -DTARGET_MACHINE=\"${MACHINE}\" -DTARGET_MACHINE_ARCH=\"${MACHINE_ARCH}\" \
-	-DMAKE_BOOTSTRAP
-LIBS=
-
-OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \
-    parse.o str.o suff.o targ.o var.o util.o
-
-LIBOBJ= lst.lib/lstAppend.o lst.lib/lstAtEnd.o lst.lib/lstAtFront.o \
-	lst.lib/lstClose.o lst.lib/lstConcat.o lst.lib/lstDatum.o \
-	lst.lib/lstDeQueue.o lst.lib/lstDestroy.o lst.lib/lstDupl.o \
-	lst.lib/lstEnQueue.o lst.lib/lstFind.o lst.lib/lstFindFrom.o \
-	lst.lib/lstFirst.o lst.lib/lstForEach.o lst.lib/lstForEachFrom.o \
-	lst.lib/lstInit.o lst.lib/lstInsert.o lst.lib/lstIsAtEnd.o \
-	lst.lib/lstIsEmpty.o lst.lib/lstLast.o lst.lib/lstMember.o \
-	lst.lib/lstNext.o lst.lib/lstOpen.o lst.lib/lstRemove.o \
-	lst.lib/lstReplace.o lst.lib/lstSucc.o
-
-bmake: ${OBJ} ${LIBOBJ}
+CFLAGS= -Iohash -I. -DTARGET_MACHINE=\"${MACHINE}\" -DTARGET_MACHINE_ARCH=\"${MACHINE_ARCH}\" -DMACHINE=\"${MACHINE}\" \
+	-DMAKE_BOOTSTRAP -DNEED_FGETLN
+LIBS= ohash/libohash.a
+
+OBJ=arch.o buf.o compat.o cond.o dir.o for.o job.o main.o make.o \
+    parse.o str.o suff.o targ.o var.o util.o error.o lowparse.o \
+    varmodifiers.o
+
+LIBOBJ=	lst.lib/lstAddNew.o lst.lib/lstAppend.o \
+	lst.lib/lstConcat.o lst.lib/lstConcatDestroy.o lst.lib/lstDeQueue.o \
+	lst.lib/lstDestroy.o lst.lib/lstDupl.o lst.lib/lstFindFrom.o \
+	lst.lib/lstForEachFrom.o lst.lib/lstInit.o lst.lib/lstInsert.o \
+	lst.lib/lstMember.o lst.lib/lstRemove.o lst.lib/lstReplace.o \
+	lst.lib/lstSucc.o
+
+bmake: varhashconsts.h ${OBJ} ${LIBOBJ}
 #	@echo 'make of make and make.0 started.'
 	${CC} ${CFLAGS} ${OBJ} ${LIBOBJ} -o bmake ${LIBS}
 	@ls -l $@
 #	nroff -h -man make.1 > make.0
 #	@echo 'make of make and make.0 completed.'
 
+GENOBJ= generate.o stats.o error.o ohash/libohash.a
+
+OHASHOBJ= ohash/ohash_create_entry.o ohash/ohash_delete.o ohash/ohash_do.o \
+	ohash/ohash_entries.o ohash/ohash_enum.o ohash/ohash_init.o \
+	ohash/ohash_interval.o ohash/ohash_lookup_interval.o \
+	ohash/ohash_lookup_memory.o ohash/ohash_qlookup.o \
+	ohash/ohash_qlookupi.o
+
+ohash/libohash.a: ${OHASHOBJ}
+	ar cq ohash/libohash.a ${OHASHOBJ}
+	ranlib ohash/libohash.a
+
+generate: ${GENOBJ}
+	${CC} ${CFLAGS} ${GENOBJ} -o generate ${LIBS}
+
+varhashconsts.h: generate
+	./generate 1 77 > varhashconsts.h
+
 clean:
-	rm -f ${OBJ} ${LIBOBJ} ${PORTOBJ} bmake
+	rm -f ${OBJ} ${LIBOBJ} ${PORTOBJ} ${GENOBJ} ${OHASHOBJ} bmake
+	rm -f varhashconsts.h generate
+
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index c3ccc6358ee..98f0eb18c3d 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: util.c,v 1.14 2001/05/03 13:41:12 espie Exp $	*/
+/*	$OpenBSD: util.c,v 1.15 2001/05/03 14:06:20 espie Exp $	*/
 /*	$NetBSD: util.c,v 1.10 1996/12/31 17:56:04 christos Exp $	*/
 
 /*
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: util.c,v 1.14 2001/05/03 13:41:12 espie Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.15 2001/05/03 14:06:20 espie Exp $";
 #endif
 
 #include <stdio.h>
@@ -353,7 +353,7 @@ signal(s, a))()
 
 #endif
 
-#ifndef BSD4_4
+#if !defined(BSD4_4) && !defined(linux)
 #ifdef __STDC__
 #include <stdarg.h>
 #else