sync -- enabled devices in GENERIC should be working

1 files changed, 76 insertions, 34 deletions

diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 7b008cffafc..e66b1728bff 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.vax,v 1.12 1998/05/17 10:31:03 niklas Exp $
-#	$NetBSD: Makefile.vax,v 1.32 1997/03/14 23:27:35 mycroft Exp $
+#	$OpenBSD: Makefile.vax,v 1.13 2000/04/27 05:47:15 bjc Exp $
+#	$NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $
 
-# Makefile for OpenBSD
+# Makefile for OpenBSD/vax
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -22,23 +22,51 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
 
+
+
+%OBJS
+
+%CFILES
+
+%SFILES
+
+MKDEP?=	mkdep
+
+# check for cross-compilation
 .if ${MACHINE} != "vax"
-CROSSDIR?=	/usr/cross/vax
+CROSSDIR?=  /usr/cross/vax
+
+CBIN=${CROSSDIR}/usr/bin
+MACHINE=vax 
+MACHINE_ARCH=vax 
+AR=${CBIN}/ar 
+AS=${CBIN}/as 
+CC=${CBIN}/cc 
+CPP=${CBIN}/cpp
+HOSTCC=cc 
+LD=${CBIN}/ld 
+NM=${CBIN}/nm 
+RANLIB=${CBIN}/ranlib 
+STRIP=${CBIN}/strip 
+SIZE=${CBIN}/size 
 
-.BEGIN:
-	CBIN=${CROSSDIR}/usr/bin; export CBIN; \
-	MACHINE=vax MACHINE_ARCH=vax AR=$$CBIN/ar AS=$$CBIN/as \
-	CC=$$CBIN/cc HOSTCC=cc LD=$$CBIN/ld NM=$$CBIN/nm \
-	RANLIB=$$CBIN/ranlib STRIP=$$CBIN/strip SIZE=$$CBIN/size ${MAKE} $@
 .else
 
+AR?=	ar
+AS?=	as
 CC?=	cc
-HOSTCC?=${CC}
+CPP?=	cpp
+LORDER?=lorder
 LD?=	ld
-MKDEP?=	mkdep
+NM?=	nm
+RANLIB?=ranlib
 STRIP?=	strip
 SIZE?=	size
-COPTS?= 	-O2
+
+.endif
+
+TSORT?=	tsort -q
+COPTS?= -O0
 
 # source tree is located via $S relative to the compilation directory
 .ifndef S
@@ -46,20 +74,29 @@ S!=	cd ../../../..; pwd
 .endif
 VAX=	$S/arch/vax
 
+HAVE_GCC28!=	${CC} --version | egrep "^(2\.8|egcs)" ; echo 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-D_VAX_INLINE_
-CWARNFLAGS=	-Werror
+CWARNFLAGS?=	-Werror 
+
+.if (${HAVE_GCC28} != "")
+CWARNFLAGS+=	-Wno-main
+.endif
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS}
+.if (${HAVE_GCC28} != "")
+CFLAGS+=	-mno-pic
+.endif
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-Z -Ttext 80000000 -e _start
+LINKFLAGS=	-N -Ttext 80000000 -e start
 STRIPFLAGS=	-d
 
-HOSTED_CC=	${HOSTCC}
+HOSTED_CC=	${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS=	${CFLAGS}
 
 ### find out what to use for libkern
+KERN_AS=	obj
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
 LIBKERN=	${KERNLIB}
@@ -79,23 +116,18 @@ LIBCOMPAT=      ${COMPATLIB_PROF}
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NOPROF_C=	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 
 HOSTED_C=	${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 
-%OBJS
-
-%CFILES
-
-%SFILES
-
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxx.o
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ=	intvec.o subr.o \
-		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
+		param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -106,14 +138,20 @@ DEBUG?=
 .if ${DEBUG} == "-g"
 LINKFLAGS+=	-X
 SYSTEM_LD_TAIL+=; \
-		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+		echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
 .else
 LINKFLAGS+=	-S
 .endif
 
 %LOAD
 
+assym.h: $S/kern/genassym.sh ${VAX}/vax/genassym.cf
+	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    < ${VAX}/vax/genassym.cf > assym.h.tmp && \
+	    mv -f assym.h.tmp assym.h
+
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
@@ -128,15 +166,15 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
-
-clean:: cleankernel
+clean::	cleankernel
 cleankernel:
 	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
-	    [Ee]rrs linterrs makelinks
+		[Ee]rrs linterrs makelinks assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${CFILES} ${VAX}/vax/swapgeneric.c ioconf.c param.c | \
+	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
+	    ${VAX}/vax/Locore.c ${CFILES} \
+	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
@@ -152,8 +190,9 @@ links:
 
 SRCS=	${VAX}/vax/intvec.s ${VAX}/vax/subr.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
+
 depend:: .depend
-.depend: ${SRCS} param.c
+.depend: ${SRCS} assym.h param.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -168,12 +207,15 @@ uipc_proto.o vfs_conf.o: Makefile
 # depend on maxusers
 machdep.o: Makefile
 
-intvec.o: ${VAX}/vax/intvec.s
+# depend on CPU configuration 
+tmscp.o ts.o uba.o uda.o autoconf.o clock.o conf.o emulate.o intvec.o: Makefile
+machdep.o sbi.o subr.o: Makefile
+
+
+intvec.o: ${VAX}/vax/intvec.s assym.h
 	${NORMAL_S}
 
-subr.o: ${VAX}/vax/subr.s
+subr.o: ${VAX}/vax/subr.s assym.h
 	${NORMAL_S}
 
 %RULES
-
-.endif